From f61bc44f4839a572fb36a44d7186fc78c995a099 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 30 Jun 2018 12:36:49 +0100
Subject: [PATCH] Better handling of temp directory
---
src/freedombone-app-babybuddy | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/freedombone-app-babybuddy b/src/freedombone-app-babybuddy
index 138c6361d..f6914e420 100755
--- a/src/freedombone-app-babybuddy
+++ b/src/freedombone-app-babybuddy
@@ -308,8 +308,11 @@ function install_babybuddy {
django-widget-tweaks plotly pandas faker \
dj-database-url gunicorn whitenoise \
easy-thumbnails python-dotenv \
- django-storages boto3 coveralls flake8 ipaddress \
- psycopg2-binary
+ django-storages boto3 coveralls flake8 ipaddress
+ pip3 install psycopg2 == "<2.7.4"
+
+ export TEMP=/tmp
+ rm -rf "$INSTALL_DIR/babybuddy"
if ! npm install -g gulp-cli; then
exit 3468365
@@ -317,17 +320,14 @@ function install_babybuddy {
pipenv install --three --dev --skip-lock
if ! npm install; then
echo $'Failed to run npm install'
- export TEMP=/tmp
exit 56376832
fi
if ! gulp build; then
echo $'Failed to run gulp build'
- export TEMP=/tmp
exit 36587356
fi
if [ ! -f babybuddy/settings/production.example.py ]; then
echo $'File not found babybuddy/settings/production.example.py'
- export TEMP=/tmp
exit 36587365835
fi
cp babybuddy/settings/production.example.py babybuddy/settings/production.py
@@ -347,7 +347,6 @@ function install_babybuddy {
if [ ! -f "/var/www/$BABYBUDDY_DOMAIN_NAME/data/db.sqlite3" ]; then
echo $'db.sqlite3 not found'
- export TEMP=/tmp
exit 24528746
fi
@@ -358,7 +357,6 @@ function install_babybuddy {
pipenv_value=$(pipenv --venv)
if [ ! "$pipenv_value" ]; then
echo $'No pipenv found'
- export TEMP=/tmp
exit 3568353
fi
@@ -443,9 +441,6 @@ function install_babybuddy {
"${PROJECT_NAME}-pass" -u "$MY_USERNAME" -a babybuddy -p "$BABYBUDDY_ADMIN_PASSWORD"
set_completion_param "babybuddy domain" "$BABYBUDDY_DOMAIN_NAME"
- export TEMP=/tmp
- rm -rf "$INSTALL_DIR/babybuddy"
-
APP_INSTALLED=1
}
--
GitLab