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

Merge pull request #1325 from dod-ccpo/setup-script-improvements

Browse Source 
Minor improvements to script/setup
This commit is contained in:
raydds 2020-01-17 14:46:42 -05:00 committed by GitHub
commit 1647d802ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
script/include/helper_functions.inc.sh
View File

@ -40,9 +40,7 @@ reset_db() {
local database_name="${1}" local database_name="${1}"
# If the DB exists, drop it # If the DB exists, drop it
set +e dropdb --if-exists "${database_name}"
dropdb "${database_name}"
set -e
# Create a fresh DB # Create a fresh DB
createdb "${database_name}" createdb "${database_name}"

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

@ -22,7 +22,7 @@ check_for_existing_virtual_environment() {
local target_python_version_regex="^Python ${python_version}" local target_python_version_regex="^Python ${python_version}"
# Check for existing venv, and if one exists, save the Python version string # Check for existing venv, and if one exists, save the Python version string
existing_venv_version=$($(pipenv --py) --version) existing_venv_version=$($(pipenv --py 2> /dev/null) --version 2> /dev/null)
if [ "$?" = "0" ]; then if [ "$?" = "0" ]; then
# Existing venv; see if the Python version matches # Existing venv; see if the Python version matches
if [[ "${existing_venv_version}" =~ ${target_python_version_regex} ]]; then if [[ "${existing_venv_version}" =~ ${target_python_version_regex} ]]; then

2
script/setup
View File

@ -6,7 +6,7 @@
source "$(dirname "${0}")"/../script/include/global_header.inc.sh source "$(dirname "${0}")"/../script/include/global_header.inc.sh
# create upload directory for app # create upload directory for app
mkdir uploads | true mkdir -p uploads
# Enable database resetting # Enable database resetting
RESET_DB="true" RESET_DB="true"