diff options
| author |  Chris Parsons <cparsons@google.com> | 2016-02-10 22:03:34 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-02-11 11:49:49 +0000 |
| commit | 55b3abb12da8b231623f1272f47875fa2634eb3b (patch) | |
| tree | 6184d863bc50c579e392a7ffb7ba9911e57cd89d /src/tools/xcode/actoolwrapper | |
| parent | 4bba26350a56e8efa11a99d431ae47ee819ecd00 (diff) | |
Base tools/objc tool script deps off of their current location
--
MOS_MIGRATED_REVID=114365733
Diffstat (limited to 'src/tools/xcode/actoolwrapper')
| -rwxr-xr-x | src/tools/xcode/actoolwrapper/actoolwrapper.sh | 11 |
1 files changed, 6 insertions, 5 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[@]}" |