Various Shell Script Fixes and Improvements - Part One

see #4023

Closes #4051.

PiperOrigin-RevId: 177279457

3 files changed, 3 insertions, 3 deletions

diff --git a/src/tools/xcode/actoolwrapper/actoolwrapper.sh b/src/tools/xcode/actoolwrapper/actoolwrapper.sh
index 1a55ac1a15..ddf7e43ad9 100755
--- a/src/tools/xcode/actoolwrapper/actoolwrapper.sh
+++ b/src/tools/xcode/actoolwrapper/actoolwrapper.sh
@@ -40,7 +40,7 @@ trap "rm -rf \"$TEMPDIR\"" EXIT
 
 TOOLARGS=()
 LASTARG=""
-for i in $@; do
+for i in "$@"; do
   if [ "$LASTARG" = "--output-partial-info-plist" ]; then
     touch "$i"
   fi
diff --git a/src/tools/xcode/environment/environment_plist.sh b/src/tools/xcode/environment/environment_plist.sh
index 057a9c8cdc..c1b5d869c4 100755
--- a/src/tools/xcode/environment/environment_plist.sh
+++ b/src/tools/xcode/environment/environment_plist.sh
@@ -25,7 +25,7 @@
 
 set -eu
 
-while [[ $# > 1 ]]
+while [[ $# -gt 1 ]]
 do
 key="$1"
 
diff --git a/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh b/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh
index be72527566..ca026745f6 100755
--- a/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh
+++ b/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh
@@ -56,7 +56,7 @@ TOOLARGS=()
 # By default, have ibtool compile storyboards (to stay compatible with the
 # native rules). If the command line includes "--link", we use it instead.
 ACTION=--compile
-for i in $@; do
+for i in "$@"; do
   if [ -e "$i" ]; then
     if [[ "$i" == *.zip ]]; then
       unzip -qq "$i" -d "$LINKDIR"