fix shellcheck warnings in scripts

Author: a1346054

appveyor.sh

@@ -125,7 +125,7 @@ if which -s pkgbuild; then
 		 --package-path . \
 		 "$OUTFILE"
     echo "Cleaning up..."
-    rm -rf $PKGID
+    rm -rf "$PKGID"
 else
     echo "Preprocessing package description..."
     INDIR=mosh-package.pmdoc.in

appveyor.yml

@@ -18,5 +18,5 @@ if out=$("$@" 2>&1); then
 else
   code=$?
   echo "$out"
-  exit $code
+  exit "$code"
 fi

macosx/build.sh

@@ -4,13 +4,13 @@
 . "$(dirname "$0")/e2e-test-subrs"
 PATH=$PATH:.:$srcdir
 # Top-level wrapper.
-if [ $# -eq 0 ]; then
+if [ "$#" -eq 0 ]; then
     e2e-test "$0" baseline variant different
     exit
 fi
 
 # OK, we have arguments, we're one of the test hooks.
-if [ $# -ne 1 ]; then
+if [ "$#" -ne 1 ]; then
     fail "bad arguments %s\n" "$@"
 fi
 

scripts/wrap-compiler-for-flag-check

@@ -4,13 +4,13 @@
 . "$(dirname "$0")/e2e-test-subrs"
 PATH=$PATH:.:$srcdir
 # Top-level wrapper.
-if [ $# -eq 0 ]; then
+if [ "$#" -eq 0 ]; then
     e2e-test "$0" baseline direct variant verify same
     exit
 fi
 
 # OK, we have arguments, we're one of the test hooks.
-if [ $# -ne 1 ]; then
+if [ "$#" -ne 1 ]; then
     fail "bad arguments %s\n" "$@"
 fi
 

src/tests/e2e-failure.test

@@ -22,7 +22,7 @@ dump_logs()
     dir=$1
     shift
     testname=$(basename "$dir" .d)
-    for logfile in $dir/*.tmux.log; do
+    for logfile in "$dir"/*.tmux.log; do
 	printf "travis_fold:start:%s-%s\n" "$testname" "$(basename "$logfile")"
 	cat "$logfile"
 	printf "travis_fold:end:%s-%s\n" "$testname" "$(basename "$logfile")"
@@ -60,7 +60,7 @@ test_exitstatus()
 ssh_localhost_check()
 {
     ssh localhost :
-    if [ $? -ne 0 ]; then
+    if [ "$?" -ne 0 ]; then
 	error "ssh to localhost failed\n"
 	return 1
     fi
@@ -93,7 +93,7 @@ if [ -z "$srcdir" ]; then
     export srcdir=$PWD
 else
     srcdir="$(cd "$srcdir" && pwd)"
-    if [ $? -ne 0 ]; then
+    if [ "$?" -ne 0 ]; then
 	error "can't cd to srcdir: %s\n" "$srcdir"
 	exit 99
     fi
@@ -113,7 +113,7 @@ case "$(basename "$0")" in
 	;;
 esac
 
-if [ $# -lt 2 ]; then
+if [ "$#" -lt 2 ]; then
     test_error "not enough args\n"
 fi
 
@@ -144,10 +144,10 @@ mkdir "${test_dir}"
 
 on_exit() {
     rv=$?
-    if test $rv -ne 0; then
+    if test "$rv" -ne 0; then
 	dump_logs "$test_dir" $test_args
     fi
-    exit $rv
+    exit "$rv"
 }
 trap on_exit EXIT
 
@@ -219,7 +219,7 @@ for run in $server_tests; do
     ${tmux_stdin} tmux -f /dev/null -S "${tmux_socket}" -C new-session -x 80 -y 24 "${srcdir}/print-exitstatus ${client_wrapper} ${sut} ${server_wrapper} \"${PWD}/${test_dir}/${run}\" \"${PWD}/${test_script} ${run}\"" > "${test_dir}/${run}.tmux.log"
     rv=$?
     rm -f "${tmux_socket}" "${test_dir}/tmux-socket"
-    if [ $rv -ne 0 ]; then
+    if [ "$rv" -ne 0 ]; then
 	test_error "tmux failure on test %s\n" "$run"
     fi
     # Check for mosh failures
@@ -282,7 +282,7 @@ for compare in $compare_tests; do
 	desired=n
 	badresult=different
     fi
-    if [ $differ != $desired ]; then
+    if [ "$differ" != "$desired" ]; then
 	test_failure "Output is %s between tests %s and %s\n" "$badresult" "$test1" "$test2"
     fi
 done
@@ -291,7 +291,7 @@ done
 if [ -n "$post" ]; then
     "${test_script}" post
     status=$?
-    if [ $status -ne 0 ]; then
-	test_exitstatus $status "Post test failed with exitstatus %d\n" $status
+    if [ "$status" -ne 0 ]; then
+	test_exitstatus "$status" "Post test failed with exitstatus %d\n" "$status"
     fi
 fi

src/tests/e2e-success.test

@@ -17,11 +17,11 @@ wait_for_clients()
     expected=$1
     while true; do 
 	n=$(tmux list-clients -F . | wc -l)
-	if [ $expected -eq 1 ]; then
-	    if [ $n -eq 1 ]; then
+	if [ "$expected" -eq 1 ]; then
+	    if [ "$n" -eq 1 ]; then
 		return
 	    fi
-	elif [ $n -ne 1 ]; then
+	elif [ "$n" -ne 1 ]; then
 	    return
 	fi
 	sleep 1
@@ -30,7 +30,7 @@ wait_for_clients()
 
 export MOSH_SERVER_PID=$PPID
 
-if [ $# -lt 2 ]; then
+if [ "$#" -lt 2 ]; then
     printf "not enough args\n" >&2
     exit 99
 fi
@@ -40,8 +40,8 @@ rm -f "$testname.capture" "$testname.exitstatus"
 trap ":" TERM HUP QUIT # If the session closes on us, let the test we're running drive.
 on_exit() {
     rv=$?
-    echo $rv > "$testname.exitstatus"
-    exit $rv
+    echo "$rv" > "$testname.exitstatus"
+    exit "$rv"
 }
 trap on_exit EXIT
 # check for tmux
@@ -55,22 +55,22 @@ eval "$@"
 testret=$?
 # Capture mosh-server runtime if possible.
 runtime=$(ps -o time= $PPID 2>/dev/null)
-if [ $? -ne 0 ]; then # Cygwin...
+if [ "$?" -ne 0 ]; then # Cygwin...
     runtime=-
 fi
 # Wait for tmux client screen to become up to date.
 sleep 1
 printf "@@@ server complete @@@" >&2
 wait_for_clients 1
 i=0
-while [ $i -lt 60 ]; do
+while [ "$i" -lt 60 ]; do
     if grep -q "@@@ server complete @@@" "$testname.tmux.log"; then
 	break
     fi
     i=$((i+1))
     sleep 1
 done
-if [ $i -ge 60 ]; then
+if [ "$i" -ge 60 ]; then
     printf "wait for tmux client update failed, erroring test\n" >&2
     exit 99
 fi
@@ -86,7 +86,7 @@ fi
 # Dump runtime into tmux log.
 printf "@@@ runtime %s @@@\n" "$runtime"
 # return useful exitstatus from harnessed command
-if [ $testret -ne 0 ]; then
+if [ "$testret" -ne 0 ]; then
     exit 1
 fi
 exit 0

src/tests/e2e-test

@@ -23,7 +23,7 @@ sleepf()
 
 seq_function()
 {
-    if [ $# -lt 1 ] || [ $# -gt 3 ]; then
+    if [ "$#" -lt 1 ] || [ "$#" -gt 3 ]; then
 	echo "bad args" >&2
     fi
     first=$1
@@ -95,7 +95,7 @@ tmux_check()
 	fi
     fi
     version=$(tmux -V)
-    if [ $? != 0 ]; then
+    if [ "$?" != 0 ]; then
 	error "tmux unavailable\n"
 	return 1
     fi
@@ -119,7 +119,7 @@ tmux_check()
     tmux_check_socket=$(mktemp -d /tmp/mosh-tmux-check.XXXXXXXX)
     tmux -f /dev/null -S "${tmux_check_socket}/s" -C new-session true
     rv=$?
-    rm ${tmux_check_socket}/s
-    rmdir ${tmux_check_socket}
-    return $rv
+    rm "${tmux_check_socket}/s"
+    rmdir "${tmux_check_socket}"
+    return "$rv"
 }

src/tests/e2e-test-server

@@ -12,13 +12,13 @@
 . "$(dirname "$0")/e2e-test-subrs"
 PATH=$PATH:.:$srcdir
 # Top-level wrapper.
-if [ $# -eq 0 ]; then
+if [ "$#" -eq 0 ]; then
     e2e-test "$0" baseline post
     exit
 fi
 
 # OK, we have arguments, we're one of the test hooks.
-if [ $# -ne 1 ]; then
+if [ "$#" -ne 1 ]; then
     fail "bad arguments %s\n" "$@"
 fi