From 994a3297c95f68caffa7e49cd104621184dabbb8 Mon Sep 17 00:00:00 2001 From: william mantly Date: Fri, 30 Sep 2016 21:38:10 -0400 Subject: [PATCH] asd --- create.sh | 8 ++++---- update.sh | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/create.sh b/create.sh index 7498137..79ec827 100644 --- a/create.sh +++ b/create.sh @@ -14,9 +14,9 @@ DJANGO_SETTINGS_MODULE=project.settings.prod export DJANGO_SETTINGS_MODULE=project.settings.prod git clone $sshURL . -/usr/local/bin/virtualenv ./env -source env/bin/activate -pip install -r requirements.txt + +./scripts/setup.sh + cp /var/www/local_settings.py project/settings/local_settings.py echo "BRANCH = '$name'" >> project/settings/local_settings.py @@ -28,7 +28,7 @@ python3 manage.py loaddata /var/www/django.json git checkout $name -pip install -r requirements.txt +./scripts/setup.sh python3 manage.py collectstatic --noinput python3 manage.py migrate diff --git a/update.sh b/update.sh index 621e5ca..4b8b3bb 100644 --- a/update.sh +++ b/update.sh @@ -12,7 +12,8 @@ source env/bin/activate git stash git pull --force origin $name -pip install -r requirements.txt + +./scripts/setup.sh python3 manage.py collectstatic --noinput python3 manage.py migrate