diff --git a/test/fetchzip.sh b/test/fetchzip.sh index 15b906e..226b0e8 100755 --- a/test/fetchzip.sh +++ b/test/fetchzip.sh @@ -5,7 +5,7 @@ PORT=$(getRandomPort) -dub remove gitcompatibledubpackage --non-interactive --version=* 2>/dev/null || true +$DUB remove gitcompatibledubpackage --non-interactive --version=* 2>/dev/null || true "$DUB" build --single "$DIR"/test_registry.d "$DIR"/test_registry --folder="$DIR/issue1336-registry" --port=$PORT & @@ -18,7 +18,7 @@ if [ $? -eq 124 ]; then die 'Fetching from responsive registry should not time-out.' fi -dub remove gitcompatibledubpackage --non-interactive --version=1.0.4 +$DUB remove gitcompatibledubpackage --non-interactive --version=1.0.4 echo "Downloads should be retried when the zip is corrupted - gitcompatibledubpackage (1.0.3)" zipOut=$(! timeout 1s "$DUB" fetch gitcompatibledubpackage --version=1.0.3 --skip-registry=all --registry=http://localhost:$PORT 2>&1) @@ -47,7 +47,7 @@ elif [ $rc -eq 124 ]; then die 'DUB timed out unexpectedly.' fi -if dub remove gitcompatibledubpackage --non-interactive --version=* 2>/dev/null; then +if $DUB remove gitcompatibledubpackage --non-interactive --version=* 2>/dev/null; then die 'DUB should not have installed a package.' fi @@ -56,4 +56,4 @@ if [ $? -eq 124 ]; then die 'Fetching from responsive registry should not time-out.' fi -dub remove gitcompatibledubpackage --non-interactive --version=1.0.2 +$DUB remove gitcompatibledubpackage --non-interactive --version=1.0.2 diff --git a/test/help.sh b/test/help.sh index 89cd08c..07b6a26 100755 --- a/test/help.sh +++ b/test/help.sh @@ -2,8 +2,6 @@ . $(dirname "${BASH_SOURCE[0]}")/common.sh -DUB=dub - ### It shows the general help message if ! { ${DUB} help | grep "Manages the DUB project in the current directory."; } then die 'DUB did not print the default help message, with the `help` command.'