diff options
author | Alexander Chung <alexander.chung@uwaterloo.ca> | 2017-02-07 12:48:26 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2017-02-07 18:27:09 +0000 |
commit | fc07142f08f9c32c1f3c757881078aba227de421 (patch) | |
tree | 70aba3849333ae98c2ce1a6824cb8b293fc60b5c /src | |
parent | a2c0192e0ca7647178d798cd6ff79699424623ad (diff) |
Add quotes to improve space support
These changes addresses issues where Windows users have a space in their username. Allows the default output_base path to be used.
Closes #2491.
--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/2491
PiperOrigin-RevId: 146773331
MOS_MIGRATED_REVID=146773331
Diffstat (limited to 'src')
-rwxr-xr-x | src/main/native/build_windows_jni.sh | 2 | ||||
-rwxr-xr-x | src/package-bazel.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/native/build_windows_jni.sh b/src/main/native/build_windows_jni.sh index f997546f48..6716f89d7b 100755 --- a/src/main/native/build_windows_jni.sh +++ b/src/main/native/build_windows_jni.sh @@ -61,7 +61,7 @@ JAVAINCLUDES="C:/Program Files/java/$JAVA/include" WINDOWS_SOURCES=() for i in $*; do if [[ "$i" =~ ^.*\.cc$ ]]; then - WINDOWS_SOURCES+=("$(cygpath -a -w $i)") + WINDOWS_SOURCES+=("\"$(cygpath -a -w $i)\"") fi done diff --git a/src/package-bazel.sh b/src/package-bazel.sh index 9a10f0cd41..19cda686cd 100755 --- a/src/package-bazel.sh +++ b/src/package-bazel.sh @@ -41,7 +41,7 @@ touch -t 198001010000.00 ${PACKAGE_DIR}/* if [ -n "${EMBEDDED_TOOLS}" ]; then mkdir ${PACKAGE_DIR}/embedded_tools - (cd ${PACKAGE_DIR}/embedded_tools && unzip -q ${WORKDIR}/${EMBEDDED_TOOLS}) + (cd ${PACKAGE_DIR}/embedded_tools && unzip -q "${WORKDIR}/${EMBEDDED_TOOLS}") fi -(cd ${PACKAGE_DIR} && find . -type f | sort | zip -qDX@ ${WORKDIR}/${OUT}) +(cd ${PACKAGE_DIR} && find . -type f | sort | zip -qDX@ "${WORKDIR}/${OUT}") |