8008: Quote more variables in package test scripts.

diff --git a/jenkins/package-testing/deb-common-test-packages.sh b/jenkins/package-testing/deb-common-test-packages.sh
index 0d1543648582f23d015291103af1fd772d7830a2..3928ba2ff0ea992cf70b052e47527e6441e7e53c 100755 (executable)
--- a/jenkins/package-testing/deb-common-test-packages.sh
+++ b/jenkins/package-testing/deb-common-test-packages.sh
@@ -6,12 +6,12 @@ set -eu
 # from the invocation path.
 target=$(echo $0 | sed 's/.*test-packages-\([^.]*\)\.sh.*/\1/')
 
-export ARV_PACKAGES_DIR=/arvados/packages/$target
+export ARV_PACKAGES_DIR="/arvados/packages/$target"
 
 dpkg-query --show > "$ARV_PACKAGES_DIR/$1.before"
 
 apt-get -qq update
-apt-get --assume-yes --force-yes install $1
+apt-get --assume-yes --force-yes install "$1"
 
 dpkg-query --show > "$ARV_PACKAGES_DIR/$1.after"
 
@@ -22,7 +22,7 @@ set -e
 mkdir -p /tmp/opts
 cd /tmp/opts
 
-export ARV_PACKAGES_DIR=/arvados/packages/$target
+export ARV_PACKAGES_DIR="/arvados/packages/$target"
 
 dpkg-deb -x $ARV_PACKAGES_DIR/"$1"_*.deb .
 
@@ -34,4 +34,4 @@ done <<EOF
 $(find -name '*.so')
 EOF
 
-exec /jenkins/package-testing/common-test-packages.sh $1
+exec /jenkins/package-testing/common-test-packages.sh "$1"

diff --git a/jenkins/package-testing/test-package-arvados-api-server.sh b/jenkins/package-testing/test-package-arvados-api-server.sh
index 64494aa7d8d79dce938177742aef7bf3897f8374..e97544828c95ee792285c31dc51bc00fda2027df 100755 (executable)
--- a/jenkins/package-testing/test-package-arvados-api-server.sh
+++ b/jenkins/package-testing/test-package-arvados-api-server.sh
@@ -17,4 +17,4 @@ case "$TARGET" in
         ;;
 esac
 
-/usr/local/rvm/bin/rvm-exec default bundle list >$ARV_PACKAGES_DIR/arados-api-server.gems
+/usr/local/rvm/bin/rvm-exec default bundle list >"$ARV_PACKAGES_DIR/arvados-api-server.gems"

diff --git a/jenkins/package-testing/test-package-arvados-sso-server.sh b/jenkins/package-testing/test-package-arvados-sso-server.sh
index 28c5618e4b16ddb7cc6923dd7072496426bb5dac..c1a377e419998057d7187f8574126c66969abaa9 100755 (executable)
--- a/jenkins/package-testing/test-package-arvados-sso-server.sh
+++ b/jenkins/package-testing/test-package-arvados-sso-server.sh
@@ -104,7 +104,7 @@ if [[ "$FORMAT" == "deb" ]]; then
   dpkg-reconfigure arvados-sso-server || EXITCODE=3
 
   cd /var/www/arvados-sso/current/
-  /usr/local/rvm/bin/rvm-exec default bundle list >$ARV_PACKAGES_DIR/arvados-sso-server.gems
+  /usr/local/rvm/bin/rvm-exec default bundle list >"$ARV_PACKAGES_DIR/arvados-sso-server.gems"
 
   # Test 3: the package should remove cleanly
   apt-get remove arvados-sso-server --yes || EXITCODE=3

diff --git a/jenkins/package-testing/test-package-arvados-workbench.sh b/jenkins/package-testing/test-package-arvados-workbench.sh
index e255786101cfd6d24ba1e5f123841d1cd96b8c17..1be4dea3edf3129545ee087026db490aa6bdddbe 100755 (executable)
--- a/jenkins/package-testing/test-package-arvados-workbench.sh
+++ b/jenkins/package-testing/test-package-arvados-workbench.sh
@@ -17,4 +17,4 @@ case "$TARGET" in
         ;;
 esac
 
-/usr/local/rvm/bin/rvm-exec default bundle list >$ARV_PACKAGES_DIR/arvados-workbench.gems
+/usr/local/rvm/bin/rvm-exec default bundle list >"$ARV_PACKAGES_DIR/arvados-workbench.gems"

diff --git a/jenkins/package-testing/test-packages-centos6.sh b/jenkins/package-testing/test-packages-centos6.sh
index ad8056487f17e0d89a7937b867b788a7463f978e..19609441b656028ab6bf38f38e9c8636427f5286 100755 (executable)
--- a/jenkins/package-testing/test-packages-centos6.sh
+++ b/jenkins/package-testing/test-packages-centos6.sh
@@ -7,14 +7,14 @@ touch /var/lib/rpm/*
 
 export ARV_PACKAGES_DIR=/arvados/packages/centos6
 
-rpm -qa | sort > $ARV_PACKAGES_DIR/$1.before
+rpm -qa | sort > "$ARV_PACKAGES_DIR/$1.before"
 
 yum install --assumeyes $1
 
-rpm -qa | sort > $ARV_PACKAGES_DIR/$1.after
+rpm -qa | sort > "$ARV_PACKAGES_DIR/$1.after"
 
 set +e
-diff $ARV_PACKAGES_DIR/$1.before $ARV_PACKAGES_DIR/$1.after > $ARV_PACKAGES_DIR/$1.diff
+diff "$ARV_PACKAGES_DIR/$1.before" "$ARV_PACKAGES_DIR/$1.after" >"$ARV_PACKAGES_DIR/$1.diff"
 set -e
 
 SCL=""
@@ -25,7 +25,7 @@ fi
 mkdir -p /tmp/opts
 cd /tmp/opts
 
-rpm2cpio $ARV_PACKAGES_DIR/$1-*.rpm | cpio -idm 2>/dev/null
+rpm2cpio "$ARV_PACKAGES_DIR/$1"-*.rpm | cpio -idm 2>/dev/null
 
 shared=$(find -name '*.so')
 if test -n "$shared" ; then
@@ -38,7 +38,7 @@ if test -n "$shared" ; then
 fi
 
 if test -n "$SCL" ; then
-    exec $SCL "/jenkins/package-testing/common-test-packages.sh $1"
+    exec $SCL "/jenkins/package-testing/common-test-packages.sh '$1'"
 else
-    exec /jenkins/package-testing/common-test-packages.sh $1
+    exec /jenkins/package-testing/common-test-packages.sh "$1"
 fi