From cd4601a70783888c9da355dc3747dc404cf26549 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Mon, 7 Oct 2019 18:05:34 -0700 Subject: [PATCH] add double-quotes to comply with shellcheck --- bin/steps/pip-install | 2 +- bin/steps/pipenv | 4 ++-- bin/steps/python | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/steps/pip-install b/bin/steps/pip-install index 1161f7d..23ff98b 100755 --- a/bin/steps/pip-install +++ b/bin/steps/pip-install @@ -42,7 +42,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then exit 1 fi - $BUILD_DIR/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=$BUILD_DIR/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent + "$BUILD_DIR/.heroku/python/bin/pip" install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src="$BUILD_DIR/.heroku/src" --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent PIP_STATUS="${PIPESTATUS[0]}" set -e diff --git a/bin/steps/pipenv b/bin/steps/pipenv index 224c828..f0df80f 100755 --- a/bin/steps/pipenv +++ b/bin/steps/pipenv @@ -58,12 +58,12 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then # Due to weird old pip behavior and pipenv behavior, pipenv upgrades pip # to latest if only --upgrade is specified. Specify upgrade strategy to # avoid this eager behavior. - $BUILD_DIR/.heroku/python/bin/pip install pipenv==$PIPENV_VERSION --upgrade --upgrade-strategy only-if-needed &> /dev/null + "$BUILD_DIR/.heroku/python/bin/pip" install pipenv==$PIPENV_VERSION --upgrade --upgrade-strategy only-if-needed &> /dev/null # Install the test dependencies, for CI. if [ "$INSTALL_TEST" ]; then puts-step "Installing test dependencies…" - /app/.heroku/python/bin/pipenv install --dev --system --deploy 2>&1 | cleanup | indent + "$BUILD_DIR/.heroku/python/bin/pipenv" install --dev --system --deploy 2>&1 | cleanup | indent # Install the dependencies. elif [[ ! -f Pipfile.lock ]]; then diff --git a/bin/steps/python b/bin/steps/python index a953b12..7dc9455 100755 --- a/bin/steps/python +++ b/bin/steps/python @@ -116,8 +116,8 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_UPDATE* ]]; then rm -fr "$BUILD_DIR/.heroku/python/lib/python*/site-packages/pip-*" rm -fr "$BUILD_DIR/.heroku/python/lib/python*/site-packages/setuptools-*" - $BUILD_DIR/.heroku/python/bin/python "$ROOT_DIR/get-pip.py" pip=="$PIP_UPDATE" &> /dev/null - $BUILD_DIR/.heroku/python/bin/pip install "$ROOT_DIR/vendor/setuptools-39.0.1-py2.py3-none-any.whl" &> /dev/null + "$BUILD_DIR/.heroku/python/bin/python" "$ROOT_DIR/get-pip.py" pip=="$PIP_UPDATE" &> /dev/null + "$BUILD_DIR/.heroku/python/bin/pip" install "$ROOT_DIR/vendor/setuptools-39.0.1-py2.py3-none-any.whl" &> /dev/null fi set -e