Merge pull request #670 from practicalswift/additional-bash-fixes

Cleanups of various bash scripts

Author: gribozavr

utils/install-package-helper.sh

@@ -35,17 +35,17 @@ argv=("$@")
 have_source_libraries=NO
 platform=""
 set -- "$@"
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
     case "$1" in
         --source-libraries)
             shift
-            if [[ $# > 0 ]]; then
+            if [[ $# -gt 0 ]]; then
                 have_source_libraries=YES
             fi
             ;;
         --platform)
             shift
-            if [[ $# > 0 ]]; then
+            if [[ $# -gt 0 ]]; then
                 platform="$1"
             fi
             ;;
@@ -63,8 +63,8 @@ elif [[ "$platform" = "" ]]; then
     exit 1
 else
     # Construct a new --source-libraries argument.
-    bindir=`dirname "$self_path"`
-    usrdir=`dirname "$bindir"`
+    bindir=$(dirname "$self_path")
+    usrdir=$(dirname "$bindir")
     source_libraries="$usrdir/lib/swift/$platform"
     if [ ! -d "$source_libraries" -o ! -x "$source_libraries" ]; then
         echo "$self_path: error: platform path inaccessible: $source_libraries"

utils/install-test-script.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 process_count=17
-process_id_max=$(($process_count - 1))
+process_id_max=$((process_count - 1))
 
 for id in $(seq 0 $process_id_max); do