]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
standalone: Correctly quote $@ where it is used.
authorIan Campbell <ian.campbell@citrix.com>
Tue, 6 Oct 2015 15:36:01 +0000 (16:36 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Thu, 8 Oct 2015 16:17:54 +0000 (17:17 +0100)
Else arguments with spaces become multiple arguments.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
standalone

index 7c7fde9e805a9fbb5e2ddd7526594f32e17cf870..25e23cac81d4deff75fc4ec6feb897a383b154eb 100755 (executable)
@@ -197,7 +197,7 @@ with_logging() {
     local log=$1; shift
     ensure_logs
     savelog -c 300 "$log" >/dev/null
-    $@ 2>&1 | tee "$log"
+    "$@" 2>&1 | tee "$log"
     rc=${PIPESTATUS[0]}
     if [ $rc -ne 0 ] ; then
        echo "FAILED rc=${rc}" >&2
@@ -240,7 +240,7 @@ case $op in
         OSSTEST_FLIGHT=$flight \
         OSSTEST_CONFIG=$config \
         OSSTEST_NO_BASELINE=$nobaseline \
-            with_logging logs/$flight/make-flight.log ./cr-daily-branch $@ $branch
+            with_logging logs/$flight/make-flight.log ./cr-daily-branch "$@" $branch
         ;;
 
     set-paths)
@@ -321,7 +321,7 @@ case $op in
        OSSTEST_FLIGHT=$flight \
        OSSTEST_HOST_REUSE=$reuse \
        OSSTEST_JOB=$job \
-           with_logging logs/$flight/$job.$ts.log ./$ts $hosts $@
+           with_logging logs/$flight/$job.$ts.log ./$ts $hosts "$@"
        ;;
 
     get-job-status)