pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix function return value and clean up code style

Browse Source 
- Fix create_virtual_environment return code; use pipenv exit code not
pipenv output
- Clean up code style in install_pipenv
This commit is contained in:
Devon Mackay 2018-07-10 10:11:30 -04:00
parent d2eff80de9
commit 89e14268e9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
script/include/setup_functions.inc.sh
View File

@ -1,20 +1,20 @@
# setup_functions.inc.sh: Functions used by the setup script # setup_functions.inc.sh: Functions used by the setup script
install_pipenv() { install_pipenv() {
exit_code=0 return_code=0
# Ensure we are not in a virtual env already # Ensure we are not in a virtual env already
if [ -z "${VIRTUAL_ENV+xxxx}" ]; then if [ -z "${VIRTUAL_ENV+is_set}" ]; then
if ! check_system_pip_for pipenv; then if ! check_system_pip_for pipenv; then
# pipenv is not installed, so install it # pipenv is not installed, so install it
echo "Installing pipenv..." echo "Installing pipenv..."
pip install pipenv pip install pipenv
# Capture pip exit code # Capture pip exit code
exit_code="${?}" return_code="${?}"
fi fi
fi fi
return "${exit_code}" return "${return_code}"
} }
create_virtual_environment() { create_virtual_environment() {
@ -32,7 +32,8 @@ create_virtual_environment() {
# The environment will be in a directory called .venv off the app # The environment will be in a directory called .venv off the app
# root directory # root directory
echo "Creating virtual environment using Python version ${python_version}..." echo "Creating virtual environment using Python version ${python_version}..."
return $(PIPENV_VENV_IN_PROJECT=true pipenv --python "${python_version}") PIPENV_VENV_IN_PROJECT=true pipenv --python "${python_version}"
return $?
} }
install_sass() { install_sass() {