InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 02:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add quotes around paths in bash scripts.

Browse Source 
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>
This commit is contained in:
John Stiles
2020-03-30 17:28:53 +00:00
committed by LUCI CQ
parent 1c4e06b7d7
commit 11f4a84bb1
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap_python3
View File

@@ -3,7 +3,7 @@
function bootstrap_python3 { function bootstrap_python3 {
base_dir=$(dirname "${BASH_SOURCE[0]}") base_dir=$(dirname "${BASH_SOURCE[0]}")
cd $base_dir cd "${base_dir}"
if [ -e ".bleeding_edge" ]; then if [ -e ".bleeding_edge" ]; then
CIPD_MANIFEST="bootstrap/manifest_bleeding_edge.txt" CIPD_MANIFEST="bootstrap/manifest_bleeding_edge.txt"
@@ -29,7 +29,7 @@ function bootstrap_python3 {
-root "$BOOTSTRAP_PATH" -root "$BOOTSTRAP_PATH"
BOOTSTRAP_PYTHON_BIN="${BOOTSTRAP_PATH}/python3/bin/python3" 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 cd - > /dev/null
} }

2
git-cl
View File

@@ -3,4 +3,4 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
. $(type -P python_runner.sh) . "$(type -P python_runner.sh)"

4
vpython3
View File

@@ -47,11 +47,11 @@ MINGW=$(uname -s | grep MINGW > /dev/null; echo $?)
if [[ $MINGW = 0 ]]; then if [[ $MINGW = 0 ]]; then
cmd.exe //c $0.bat "$@" cmd.exe //c $0.bat "$@"
elif [[ $DEPOT_TOOLS_BOOTSTRAP_PYTHON3 != 0 ]]; then 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" source "$base_dir/bootstrap_python3"
bootstrap_python3 bootstrap_python3
fi 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" "$@" exec "$base_dir/.cipd_bin/vpython3" -vpython-interpreter "$PYTHON3_BIN_RELDIR/python3" "$@"
else else
exec "$base_dir/.cipd_bin/vpython3" "$@" exec "$base_dir/.cipd_bin/vpython3" "$@"