From 2653b64e36e612021be4e3e4bd8fe781381b1e0b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 28 Jun 2018 14:49:24 +0100
Subject: [PATCH] Fixing babybuddy
---
src/freedombone-app-babybuddy | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/freedombone-app-babybuddy b/src/freedombone-app-babybuddy
index 3acc01dc3..63d7aa3a9 100755
--- a/src/freedombone-app-babybuddy
+++ b/src/freedombone-app-babybuddy
@@ -294,19 +294,7 @@ function install_babybuddy {
git checkout "$BABYBUDDY_COMMIT" -b "$BABYBUDDY_COMMIT"
set_completion_param "babybuddy commit" "$BABYBUDDY_COMMIT"
- pip3 install pipenv gunicorn
- virtualenv --python=python3 ./env
- if [ ! -d "/var/www/$BABYBUDDY_DOMAIN_NAME/htdocs/env" ]; then
- echo $'env not created'
- exit 356835685
- fi
- pipenv_value="/var/www/$BABYBUDDY_DOMAIN_NAME/htdocs/env"
-
- #pipenv_value=$(pipenv --venv)
- #if [ ! "$pipenv_value" ]; then
- # echo $'No pipenv found'
- # exit 3568353
- #fi
+ pip3 install --user pipenv gunicorn
if ! npm install -g gulp-cli; then
exit 3468365
@@ -345,6 +333,12 @@ function install_babybuddy {
chmod 640 "/var/www/$BABYBUDDY_DOMAIN_NAME/data/db.sqlite3"
chmod 750 "/var/www/$BABYBUDDY_DOMAIN_NAME/data"
+ pipenv_value=$(pipenv --venv)
+ if [ ! "$pipenv_value" ]; then
+ echo $'No pipenv found'
+ exit 3568353
+ fi
+
{ echo '[uwsgi]';
echo 'plugins = python3';
echo 'project = babybuddy';
--
GitLab