Base tools/objc tool script deps off of their current location

--
MOS_MIGRATED_REVID=114365733

4 files changed, 21 insertions, 17 deletions

diff --git a/src/tools/xcode/actoolwrapper/actoolwrapper.sh b/src/tools/xcode/actoolwrapper/actoolwrapper.sh
index c0d21979b7..d9c4fc9a4b 100755
--- a/src/tools/xcode/actoolwrapper/actoolwrapper.sh
+++ b/src/tools/xcode/actoolwrapper/actoolwrapper.sh
@@ -21,10 +21,11 @@
 
 set -eu
 
-REALPATH=$0.runfiles/external/bazel_tools/tools/objc/realpath
-WRAPPER=$0.runfiles/external/bazel_tools/tools/objc/xcrunwrapper.sh
+MY_LOCATION=${MY_LOCATION:-"$0.runfiles/external/bazel_tools/tools/objc"}
+REALPATH="${MY_LOCATION}/realpath"
+WRAPPER="${MY_LOCATION}/xcrunwrapper.sh"
 
-OUTZIP=$($REALPATH "$1")
+OUTZIP=$("${REALPATH}" "$1")
 shift 1
 TEMPDIR=$(mktemp -d -t actoolZippingOutput)
 trap "rm -rf \"$TEMPDIR\"" EXIT
@@ -44,7 +45,7 @@ for i in $@; do
     touch "$i"
   fi
   if [ -e "$i" ]; then
-    ARG=$($REALPATH "$i")
+    ARG=$("${REALPATH}" "$i")
     TOOLARGS+=("$ARG")
   else
     TOOLARGS+=("$i")
@@ -61,7 +62,7 @@ done
 # helps.
 # Yes IBTOOL appears to be correct here due to actool and ibtool being based
 # on the same codebase.
-$WRAPPER actool --errors --warnings --notices \
+"${WRAPPER}" actool --errors --warnings --notices \
     --compress-pngs --output-format human-readable-text \
     --compile "$TEMPDIR" "${TOOLARGS[@]}"
 
diff --git a/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh b/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh
index 8271399e33..6ce6dc3e0c 100755
--- a/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh
+++ b/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh
@@ -25,10 +25,11 @@
 
 set -eu
 
-REALPATH=$0.runfiles/external/bazel_tools/tools/objc/realpath
-WRAPPER=$0.runfiles/external/bazel_tools/tools/objc/xcrunwrapper.sh
+MY_LOCATION=${MY_LOCATION:-"$0.runfiles/external/bazel_tools/tools/objc"}
+REALPATH="${MY_LOCATION}/realpath"
+WRAPPER="${MY_LOCATION}/xcrunwrapper.sh"
 
-OUTZIP=$($REALPATH "$1")
+OUTZIP=$("${REALPATH}" "$1")
 ARCHIVEROOT="$2"
 shift 2
 TEMPDIR=$(mktemp -d -t ibtoolZippingOutput)
@@ -37,7 +38,7 @@ trap "rm -rf \"$TEMPDIR\"" EXIT
 FULLPATH="$TEMPDIR/$ARCHIVEROOT"
 PARENTDIR=$(dirname "$FULLPATH")
 mkdir -p "$PARENTDIR"
-FULLPATH=$($REALPATH "$FULLPATH")
+FULLPATH=$("${REALPATH}" "$FULLPATH")
 
 # IBTool needs to have absolute paths sent to it, so we call realpaths on
 # on all arguments seeing if we can expand them.
@@ -45,7 +46,7 @@ FULLPATH=$($REALPATH "$FULLPATH")
 TOOLARGS=()
 for i in $@; do
   if [ -e "$i" ]; then
-    ARG=$($REALPATH "$i")
+    ARG=$("${REALPATH}" "$i")
     TOOLARGS+=("$ARG")
   else
     TOOLARGS+=("$i")
@@ -59,7 +60,7 @@ done
 # you may also see if
 #   IBToolNeverDeque=1
 # helps.
-$WRAPPER ibtool --errors --warnings --notices \
+"${WRAPPER}" ibtool --errors --warnings --notices \
     --auto-activate-custom-fonts --output-format human-readable-text \
     --compile "$FULLPATH" "${TOOLARGS[@]}"
 
diff --git a/src/tools/xcode/momcwrapper/momcwrapper.sh b/src/tools/xcode/momcwrapper/momcwrapper.sh
index 4387873534..fb144a5ee1 100755
--- a/src/tools/xcode/momcwrapper/momcwrapper.sh
+++ b/src/tools/xcode/momcwrapper/momcwrapper.sh
@@ -22,10 +22,11 @@
 
 set -eu
 
-REALPATH=$0.runfiles/external/bazel_tools/tools/objc/realpath
-WRAPPER=$0.runfiles/external/bazel_tools/tools/objc/xcrunwrapper.sh
+MY_LOCATION=${MY_LOCATION:-"$0.runfiles/external/bazel_tools/tools/objc"}
+REALPATH="${MY_LOCATION}/realpath"
+WRAPPER="${MY_LOCATION}/xcrunwrapper.sh"
 
-OUTZIP=$($REALPATH "$1")
+OUTZIP=$("${REALPATH}" "$1")
 NAME="$2"
 shift 2
 TEMPDIR=$(mktemp -d -t momcZippingOutput)
diff --git a/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh b/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh
index 86f8b58457..33b2407627 100755
--- a/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh
+++ b/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh
@@ -21,10 +21,11 @@
 
 set -eu
 
-REALPATH=$0.runfiles/external/bazel_tools/tools/objc/realpath
-WRAPPER=$0.runfiles/external/bazel_tools/tools/objc/xcrunwrapper.sh
+MY_LOCATION=${MY_LOCATION:-"$0.runfiles/external/bazel_tools/tools/objc"}
+REALPATH="${MY_LOCATION}/realpath"
+WRAPPER="${MY_LOCATION}/xcrunwrapper.sh"
 
-OUTZIP=$($REALPATH "$1")
+OUTZIP=$("${REALPATH}" "$1")
 shift 1
 TEMPDIR=$(mktemp -d -t swiftstdlibtoolZippingOutput)
 trap "rm -rf \"$TEMPDIR\"" EXIT