From 1675f863e1be2c70b646fb88627c46ed31c52d0f Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Sun, 28 Jun 2020 05:18:31 +0000 Subject: [PATCH] fix update script --- .gitignore | 1 + api/tacticalrmm/tacticalrmm/settings.py | 2 +- update.sh | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 0da03994..43058ac4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .quasar node_modules /dist +web/dist .env.local .env.*.local npm-debug.log* diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index c051c455..fbb69799 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -11,7 +11,7 @@ AUTH_USER_MODEL = "accounts.User" # bump this version everytime vue code is changed # to alert user they need to manually refresh their browser -APP_VER = "0.0.3" +APP_VER = "0.0.4" INSTALLED_APPS = [ "django.contrib.admin", diff --git a/update.sh b/update.sh index 2ed0b9ea..f39497b2 100644 --- a/update.sh +++ b/update.sh @@ -5,17 +5,17 @@ do sudo systemctl stop ${i} done -cd /home/${USER}/rmm/ +cd /rmm git fetch origin develop git reset --hard FETCH_HEAD git clean -df -cp /home/${USER}/rmm/_modules/* /srv/salt/_modules/ -cp /home/${USER}/rmm/scripts/* /srv/salt/scripts/ -rm -rf /home/${USER}/rmm/api/env -cd /home/${USER}/rmm/api -python3.7 -m venv env -source /home/${USER}/rmm/api/env/bin/activate -cd /home/${USER}/rmm/api/tacticalrmm +cp /rmm/_modules/* /srv/salt/_modules/ +cp /rmm/scripts/* /srv/salt/scripts/ +rm -rf /rmm/api/env +cd /rmm/api +python3 -m venv env +source /rmm/api/env/bin/activate +cd /rmm/api/tacticalrmm pip install --no-cache-dir --upgrade pip pip install --no-cache-dir --upgrade setuptools wheel pip install --no-cache-dir -r requirements.txt @@ -25,13 +25,13 @@ python manage.py delete_tokens deactivate -rm -rf /home/${USER}/rmm/web/node_modules -rm -rf /home/${USER}/rmm/web/dist -cd /home/${USER}/rmm/web +rm -rf /rmm/web/node_modules +rm -rf /rmm/web/dist +cd /rmm/web npm install npm run build sudo rm -rf /var/www/rmm/dist -sudo cp -pvr /home/${USER}/rmm/web/dist /var/www/rmm/ +sudo cp -pvr /rmm/web/dist /var/www/rmm/ sudo chown www-data:www-data -R /var/www/rmm/dist for i in celery celery-winupdate celerybeat rmm nginx