Shellcheck fixes round 2

Also update the sanity check
script to include .job files.

Change-Id: Ibf72d9ff346ff7b012d4e282a6ac8f3b7e73590d

1 files changed, 22 insertions, 16 deletions

diff --git a/jenkins-helpers.sh b/jenkins-helpers.sh
index 3c0bd7a0..f274e890 100644
--- a/jenkins-helpers.sh
+++ b/jenkins-helpers.sh
@@ -7,7 +7,7 @@ abs_path ()
     (
     set -euf -o pipefail
 
-    echo "$(cd $(dirname "$1") && pwd)/$(basename "$1")"
+    echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
     )
 }
 
@@ -62,11 +62,12 @@ print_nodes_in_labels ()
     (
     set -euf -o pipefail
 
-    local labels="$@"
+    local labels=( "$@" )
     local label
-    local tmpfile=$(mktemp)
+    local tmpfile
+    tmpfile=$(mktemp)
 
-    for label in $labels; do
+    for label in "${labels[@]}"; do
 	# Handle gracefully the case where the label contains no
 	# machine: we don't want to generate an error, rather return
 	# an empty string. Use a tmp file so that we still generate an
@@ -86,8 +87,7 @@ print_node_with_least_containers ()
     (
     set -euf -o pipefail
 
-    local tester_labels="$@"
-    local tester
+    local tester_labels=( "$@" )
     local testers
     local load_value
     local tester_min_load_name=""
@@ -96,8 +96,8 @@ print_node_with_least_containers ()
 
     # Re. --random-sort below: shuffle node list to mitigate races
     # when starting multiple containers at the same time
-    testers=$(print_nodes_in_labels $tester_labels | sort --random-sort)
-    for tester in $testers; do
+    testers=$(print_nodes_in_labels ${tester_labels[*]} | sort --random-sort)
+    for tester in "${testers[@]}"; do
         ret=0
 	tester_host=$(print_host_for_node $tester)
         load_value=$(timeout 30s ssh ${tester_host} docker ps | wc -l) || ret=$?
@@ -257,11 +257,16 @@ remote_exec ()
     (
     set -euf -o pipefail
 
-    local host="$(echo "$1" | cut -d: -f 1)"
-    local port="$(echo "$1" | cut -s -d: -f 2)"
-    local dir="$(echo "$1" | cut -s -d: -f 3)"
-    local opts="$(echo "$1" | cut -s -d: -f 4)"
-    local env_vars="$(echo "$1" | cut -s -d: -f 5)"
+    local host
+    host="$(echo "$1" | cut -d: -f 1)"
+    local port
+    port="$(echo "$1" | cut -s -d: -f 2)"
+    local dir
+    dir="$(echo "$1" | cut -s -d: -f 3)"
+    local opts
+    opts="$(echo "$1" | cut -s -d: -f 4)"
+    local env_vars
+    env_vars="$(echo "$1" | cut -s -d: -f 5)"
     shift
     local -a cmd
     cmd=()
@@ -575,7 +580,7 @@ wget_wildcard_url ()
     # $(dirname "$url") may not be a valid URL.  Since we only use '*'
     # as wildcards, check if a '*' is present in $url_basename, and if
     # not, do a direct wget on $url to avoid accessing $(dirname "$url")
-    if echo "$url_basename" | grep '*' ; then
+    if echo "$url_basename" | grep '\*' ; then
 	wget --progress=dot:giga -r --no-parent --no-directories --level 1 "--directory-prefix=$tmpdir" -A "$url_basename" $wget_opts "$@" "$(dirname "$url")/"
     else
 	wget --progress=dot:giga -r --no-parent --no-directories --level 1 "--directory-prefix=$tmpdir" $wget_opts "$@" "$url"
@@ -819,7 +824,8 @@ manifest_push ()
     local filename="$1"
 
     # Resolve absolute path to manifest.
-    local dir=$(dirname "$filename")
+    local dir
+    dir=$(dirname "$filename")
     mkdir -p "$dir"
     dir=$(cd "$dir"; pwd)
 
@@ -920,7 +926,7 @@ EOF
 		manifest_push "$2"
 		cat <<EOF | manifest_out
 # Start option processing
-jenkins_scripts_rev=$(git -C $(dirname "$0") rev-parse HEAD)
+jenkins_scripts_rev=$(git -C "$(dirname "$0")" rev-parse HEAD)
 EOF
 		num=2
 		;;