From 0c26eae21406a5e9382beadae4c4f442e7f538c1 Mon Sep 17 00:00:00 2001
From: Samuel Spencer <theodore.therone@gmail.com>
Date: Sat, 12 Aug 2017 16:55:15 +1000
Subject: [PATCH] Allow environment variables during pip install, fixes #416
(#417)
* Allow environment variables during pip install, fixes #416
* shift sub-env command, fix typo
* bash check thingy fixed
---
bin/steps/pip-install | 4 ++--
bin/steps/pipenv | 2 +-
bin/utils | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bin/steps/pip-install b/bin/steps/pip-install
index ee7e3589..d0941f2a 100755
--- a/bin/steps/pip-install
+++ b/bin/steps/pip-install
@@ -6,7 +6,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
puts-step "Installing requirements with pip"
set +e
- /app/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent
+ sub-env /app/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent
PIP_STATUS="${PIPESTATUS[0]}"
set -e
@@ -22,4 +22,4 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
/app/.heroku/python/bin/pip freeze --disable-pip-version-check > .heroku/python/requirements-installed.txt
echo
-fi
\ No newline at end of file
+fi
diff --git a/bin/steps/pipenv b/bin/steps/pipenv
index 23032ade..6ccd3eed 100644
--- a/bin/steps/pipenv
+++ b/bin/steps/pipenv
@@ -18,4 +18,4 @@ if [[ -f Pipfile ]]; then
/app/.heroku/python/bin/pip freeze > requirements.txt
fi
-fi
\ No newline at end of file
+fi
diff --git a/bin/utils b/bin/utils
index 59273a7c..4a06a469 100755
--- a/bin/utils
+++ b/bin/utils
@@ -72,7 +72,7 @@ sub-env() {
done
fi
- $1
+ "$@"
)
}
--
GitLab