From 11f4a84bb1b3918230d025c91f3331d21411a22b Mon Sep 17 00:00:00 2001
From: John Stiles <johnstiles@google.com>
Date: Mon, 30 Mar 2020 17:28:53 +0000
Subject: [PATCH] Add quotes around paths in bash scripts.

This allows git-cl to run successfully when the depot tools are installed to a path with a space in it.

Change-Id: I79fa44d13f89fb0ee1baaa90961b4c4284913c40
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2125626
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
---
 bootstrap_python3 | 4 ++--
 git-cl            | 2 +-
 vpython3          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrap_python3 b/bootstrap_python3
index 02c63d957a..96110dee56 100644
--- a/bootstrap_python3
+++ b/bootstrap_python3
@@ -3,7 +3,7 @@
 function bootstrap_python3 {
   base_dir=$(dirname "${BASH_SOURCE[0]}")
 
-  cd $base_dir
+  cd "${base_dir}"
 
   if [ -e ".bleeding_edge" ]; then
     CIPD_MANIFEST="bootstrap/manifest_bleeding_edge.txt"
@@ -29,7 +29,7 @@ function bootstrap_python3 {
       -root "$BOOTSTRAP_PATH"
 
   BOOTSTRAP_PYTHON_BIN="${BOOTSTRAP_PATH}/python3/bin/python3"
-  "$BOOTSTRAP_PYTHON_BIN" "bootstrap/bootstrap.py" --bootstrap-name $BOOTSTRAP_PATH
+  "$BOOTSTRAP_PYTHON_BIN" "bootstrap/bootstrap.py" --bootstrap-name "$BOOTSTRAP_PATH"
 
   cd - > /dev/null
 }
diff --git a/git-cl b/git-cl
index 935365f976..d4feca08fb 100755
--- a/git-cl
+++ b/git-cl
@@ -3,4 +3,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-. $(type -P python_runner.sh)
+. "$(type -P python_runner.sh)"
diff --git a/vpython3 b/vpython3
index f5dee3f0e7..b8a8334a6a 100755
--- a/vpython3
+++ b/vpython3
@@ -47,11 +47,11 @@ MINGW=$(uname -s | grep MINGW > /dev/null; echo $?)
 if [[ $MINGW = 0 ]]; then
   cmd.exe //c $0.bat "$@"
 elif [[ $DEPOT_TOOLS_BOOTSTRAP_PYTHON3 != 0 ]]; then
-  if [[ ! -e $base_dir/python3_bin_reldir.txt ]]; then
+  if [[ ! -e "$base_dir/python3_bin_reldir.txt" ]]; then
     source "$base_dir/bootstrap_python3"
     bootstrap_python3
   fi
-  PYTHON3_BIN_RELDIR="$base_dir/$(cat $base_dir/python3_bin_reldir.txt | xargs echo)"
+  PYTHON3_BIN_RELDIR="$base_dir/$(cat "$base_dir/python3_bin_reldir.txt" | xargs echo)"
   exec "$base_dir/.cipd_bin/vpython3" -vpython-interpreter  "$PYTHON3_BIN_RELDIR/python3" "$@"
 else
   exec "$base_dir/.cipd_bin/vpython3" "$@"