diff --git a/test/Dockerfile b/test/Dockerfile index 38bea54..e6a0a97 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:18.04 MAINTAINER Tim Byrne # Shellcheck and esh versions -ARG SC_VER=0.7.1 +ARG SC_VER=0.8.0 ARG ESH_VER=0.3.1 # Install prerequisites and configure UTF-8 locale diff --git a/test/conftest.py b/test/conftest.py index 13e0f86..ea7eee6 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -25,7 +25,7 @@ def pytest_addoption(parser): @pytest.fixture(scope='session') def shellcheck_version(): """Version of shellcheck supported""" - return '0.7.1' + return '0.8.0' @pytest.fixture(scope='session') diff --git a/yadm b/yadm index b11ccbf..117c2ca 100755 --- a/yadm +++ b/yadm @@ -170,8 +170,8 @@ function score_file() { tgt="${src%%##*}" conditions="${src#*##}" - if [ "${tgt#$YADM_ALT/}" != "${tgt}" ]; then - tgt="${YADM_BASE}/${tgt#$YADM_ALT/}" + if [ "${tgt#"$YADM_ALT/"}" != "${tgt}" ]; then + tgt="${YADM_BASE}/${tgt#"$YADM_ALT/"}" fi score=0 @@ -552,8 +552,8 @@ function alt() { if [[ $possible_alt =~ .\#\#. ]]; then base_alt="${possible_alt%%##*}" yadm_alt="${YADM_BASE}/${base_alt}" - if [ "${yadm_alt#$YADM_ALT/}" != "${yadm_alt}" ]; then - base_alt="${yadm_alt#$YADM_ALT/}" + if [ "${yadm_alt#"$YADM_ALT/"}" != "${yadm_alt}" ]; then + base_alt="${yadm_alt#"$YADM_ALT/"}" fi possible_alts+=("$YADM_BASE/${base_alt}") fi @@ -1382,7 +1382,7 @@ function upgrade() { ; do if [ -e "$legacy_path" ]; then - new_filename=${legacy_path#$YADM_LEGACY_DIR/} + new_filename="${legacy_path#"$YADM_LEGACY_DIR/"}" new_filename="$YADM_DIR/$new_filename" actions_performed=1 echo "Moving $legacy_path to $new_filename" @@ -1946,7 +1946,7 @@ function relative_path() { result="" count=0 - while [ "${full#$common_part}" == "${full}" ]; do + while [ "${full#"$common_part"}" == "${full}" ]; do [ "$count" = "500" ] && return # this is a failsafe # no match, means that candidate common part is not correct # go up one level (reduce common part) @@ -1967,7 +1967,7 @@ function relative_path() { # since we now have identified the common part, # compute the non-common part - forward_part="${full#$common_part}" + forward_part="${full#"$common_part"}" # and now stick all parts together if [[ -n $result ]] && [[ -n $forward_part ]]; then