7 files changed, 15 insertions, 13 deletions
diff --git a/scripts/bootstrap/buildenv.sh b/scripts/bootstrap/buildenv.sh
index 60a375d05a..62ebc111f7 100755
--- a/scripts/bootstrap/buildenv.sh
+++ b/scripts/bootstrap/buildenv.sh
@@ -146,8 +146,8 @@ function run_atexit_handlers() {
 
 function tempdir() {
   local tmp=${TMPDIR:-/tmp}
-  mkdir -p ${tmp}
-  local DIR="$(mktemp -d ${tmp%%/}/bazel_XXXXXXXX)"
+  mkdir -p "${tmp}"
+  local DIR="$(mktemp -d "${tmp%%/}/bazel_XXXXXXXX")"
   mkdir -p "${DIR}"
   local DIRBASE=$(basename "${DIR}")
   eval "cleanup_tempdir_${DIRBASE}() { rm -rf '${DIR}'; }"
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index 30495babd3..8dfa7c340f 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -45,8 +45,8 @@ fi
 DIRS=$(echo src/{java_tools/singlejar/java/com/google/devtools/build/zip,main/java,tools/xcode-common/java/com/google/devtools/build/xcode/{common,util}} third_party/java/dd_plist/java ${OUTPUT_DIR}/src)
 EXCLUDE_FILES=src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
 
-mkdir -p ${OUTPUT_DIR}/classes
-mkdir -p ${OUTPUT_DIR}/src
+mkdir -p "${OUTPUT_DIR}/classes"
+mkdir -p "${OUTPUT_DIR}/src"
 
 # May be passed in from outside.
 ZIPOPTS="$ZIPOPTS"
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}")
diff --git a/tools/cpp/wrapper/bin/call_python.bat.tpl b/tools/cpp/wrapper/bin/call_python.bat.tpl
index 1e8747c25e..1beb42698a 100644
--- a/tools/cpp/wrapper/bin/call_python.bat.tpl
+++ b/tools/cpp/wrapper/bin/call_python.bat.tpl
@@ -17,9 +17,9 @@
 set arg0=%~1
 for %%F in ("%arg0%") do set DRIVER_BIN=%%~dpF
 
-for /F %%i in ("%arg0%") do set TOOLNAME=%%~ni
+for /F "delims=" %%i in ("%arg0%") do set TOOLNAME=%%~ni
 
-set PYDIR="%DRIVER_BIN%pydir"
+set PYDIR=%DRIVER_BIN%pydir
 
 if not defined MSVCPYTHON set MSVCPYTHON="%{python_binary}"
 %MSVCPYTHON% -B "%PYDIR%\%TOOLNAME%.py" %*
diff --git a/tools/cpp/wrapper/bin/pydir/msvc_link.py b/tools/cpp/wrapper/bin/pydir/msvc_link.py
index 98c1a0b5e7..91176446f8 100644
--- a/tools/cpp/wrapper/bin/pydir/msvc_link.py
+++ b/tools/cpp/wrapper/bin/pydir/msvc_link.py
@@ -15,6 +15,7 @@
 """Wrapper script for executing the Microsoft Linker."""
 
 import os
+import re
 import sys
 import msvc_tools
 
@@ -25,8 +26,8 @@ sys.path.append(SCRIPT_DIR)
 LINKPATTERNS = [
     ('-m(32|64)', ['$TARGET_ARCH']),
     ('-Xcompilation-mode=(dbg|fastbuild|opt)', ['$COMPILATION_MODE']),
-    (('rcs.*', '(.+)'), ['/OUT:$PATH0']),
-    (('-o', '(.+)'), ['/OUT:$PATH0']),
+    (('rcs.*', '(.+)'), ['/OUT:"$PATH0"']),
+    (('-o', '(.+)'), ['/OUT:"$PATH0"']),
     ('-B(.+)', []),
     ('-lpthread', []),
     ('-L(.+)', ['/LIBPATH:$PATH0']),
@@ -75,7 +76,7 @@ class MsvcLinker(msvc_tools.WindowsRunner):
     name = ''
     for arg in parser.options:
       if '/OUT:' in arg:
-        name = arg[5:]
+        name = re.sub(r'^"|"$', '', arg[5:])
     if not name:
       raise msvc_tools.Error('No output file name specified!')
     # Check if the library is empty, which is what happens when we create header
diff --git a/tools/cpp/wrapper/bin/pydir/msvc_tools.py.tpl b/tools/cpp/wrapper/bin/pydir/msvc_tools.py.tpl
index 7b46ef44bf..e3a9c7c499 100644
--- a/tools/cpp/wrapper/bin/pydir/msvc_tools.py.tpl
+++ b/tools/cpp/wrapper/bin/pydir/msvc_tools.py.tpl
@@ -509,7 +509,8 @@ class WindowsRunner(object):
         # Using parameter file as input when linking static libraries.
         params_file = open(parser.params_file, 'w')
         for arg in args:
-          params_file.write(arg + '\n')
+          params_file.write(('"%s"' % arg) if os.path.isfile(arg) else arg)
+          params_file.write('\n')
         params_file.close()
       except (IOError, e):
         print('Could not open', parser.params_file, 'for writing:', str(e))