summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2017-11-28 11:02:45 -0800
committerTim Burke <tim.burke@gmail.com>2017-11-28 11:02:45 -0800
commitcb2778659e8d69d8741ca3167314862f8555a989 (patch)
treec5c7b7c4dcf19370e51a8d327d37768a07922d1f /tools
parent2b3a659da47b9936b5801736e1d10164bb9c6227 (diff)
downloadpython-swiftclient-cb2778659e8d69d8741ca3167314862f8555a989.tar.gz
Make tox runnable in a directory with spaces
I noticed a disturbing lack of quote-wrapping in change I7cb4b44952713752435e1faf0f63bf0d37e7dda6 but as I poked at it, I realized that trouble runs rampant. This seems to clean it all up, though I haven't tested *every* environment we define. Change-Id: I1454eb113e5bd9125d39f2e57e2ed96f6ddc42fc
Diffstat (limited to 'tools')
-rwxr-xr-xtools/tox_install.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
index 43468e4..f3a83e9 100755
--- a/tools/tox_install.sh
+++ b/tools/tox_install.sh
@@ -4,7 +4,7 @@
# with installing the client from source. We should remove the version pin in
# the constraints file before applying it for from-source installation.
-CONSTRAINTS_FILE=$1
+CONSTRAINTS_FILE="$1"
shift 1
set -e
@@ -13,18 +13,18 @@ set -e
# published to logs.openstack.org for easy debugging.
localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
-if [[ $CONSTRAINTS_FILE != http* ]]; then
- CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
+if [[ "$CONSTRAINTS_FILE" != http* ]]; then
+ CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
fi
# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
-curl $CONSTRAINTS_FILE --insecure --progress-bar --output $localfile
+curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
-pip install -c$localfile openstack-requirements
+python -m pip install -c"$localfile" openstack-requirements
# This is the main purpose of the script: Allow local installation of
# the current repo. It is listed in constraints file and thus any
# install will be constrained and we need to unconstrain it.
-edit-constraints $localfile -- $CLIENT_NAME
+python "$(which edit-constraints)" "$localfile" -- $CLIENT_NAME
-pip install -c$localfile -U $*
+python -m pip install -c"$localfile" -U "$@"
exit $?