From d79d55aae9dea29ffe644d5a1732e1d3f32528cf Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 22 Sep 2022 00:10:01 +0200
Subject: [PATCH] more cleanup

---
 scripts/install | 36 ++++++++++++++++++------------------
 scripts/upgrade |  6 ++++--
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/scripts/install b/scripts/install
index 0ffa581..4994aee 100755
--- a/scripts/install
+++ b/scripts/install
@@ -143,8 +143,6 @@ pushd $final_path
 	ynh_npm ci
 popd
 
-ynh_node_path=$ynh_node
-
 #=================================================
 # CREATE DATA DIRECTORY
 #=================================================
@@ -160,10 +158,10 @@ chmod -R o-rwx "$datadir"
 chown -R $app:www-data "$datadir"
 
 #=================================================
-# CREATE ARCHIVEBOX CONFIG
+# ADD A CONFIGURATION
 #=================================================
+ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-# copy configuration file
 ynh_add_config --template="../conf/ArchiveBox.conf" --destination="$datadir/ArchiveBox.conf"
 
 # permissions
@@ -176,16 +174,17 @@ chown -R $app:www-data "$datadir"
 #=================================================
 ynh_script_progression --message="Initializing Archivebox" --weight=1
 
-cd $datadir && ynh_exec_as $app $archivebox_cmd init
+pushd $datadir
+	ynh_exec_as $app $archivebox_cmd init
 
-ynh_script_progression --message="Checking if admin superuser already exists: $admin" --weight=1
-USER_EXISTS=$(cd $datadir && ynh_exec_as $app $archivebox_cmd manage shell -c "from django.contrib.auth.models import User; print(User.objects.filter(username='$admin').count())")
-ynh_script_progression --message="Found users: $USER_EXISTS" --weight=1
+	ynh_script_progression --message="Checking if admin superuser already exists: $admin" --weight=1
+	USER_EXISTS=$(ynh_exec_as $app $archivebox_cmd manage shell -c "from django.contrib.auth.models import User; print(User.objects.filter(username='$admin').count())")
+	ynh_script_progression --message="Found users: $USER_EXISTS" --weight=1
 
-if [ $USER_EXISTS -eq 1 ]
-then
-	ynh_script_progression --message="User already exists: setting admin password" --weight=1
-ynh_exec_as $app /usr/bin/expect<<EOF
+	if [ $USER_EXISTS -eq 1 ]
+	then
+		ynh_script_progression --message="User already exists: setting admin password" --weight=1
+		ynh_exec_as $app /usr/bin/expect<<EOF
 set force_conservative 0  ;
 set timeout -1
 spawn sh -c "cd $datadir && $archivebox_cmd manage changepassword $admin"
@@ -196,9 +195,9 @@ expect "*?assword (again): "
 send -- "$password\r"
 expect eof
 EOF
-else
-	ynh_script_progression --message="Creating new archivebox superuser: $admin" --weight=1
-	ynh_exec_as $app /usr/bin/expect<<EOF
+	else
+		ynh_script_progression --message="Creating new archivebox superuser: $admin" --weight=1
+		ynh_exec_as $app /usr/bin/expect<<EOF
 set force_conservative 0  ;
 set timeout -1
 spawn sh -c "cd $datadir && $archivebox_cmd manage createsuperuser --username $admin --email $admin_mail"
@@ -209,10 +208,11 @@ expect "*?assword (again): "
 send -- "$password\r"
 expect eof
 EOF
-fi
+	fi
 
-ynh_script_progression --message="Finishing Archivebox Setup" --weight=1
-cd $datadir && ynh_exec_as $app $ynh_node_load_PATH $archivebox_cmd init --setup
+	ynh_script_progression --message="Finishing Archivebox Setup" --weight=1
+	ynh_exec_as $app $ynh_node_load_PATH $archivebox_cmd init --setup
+popd
 
 #=================================================
 # SETUP SYSTEMD
diff --git a/scripts/upgrade b/scripts/upgrade
index 752c179..9ca909f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -99,10 +99,10 @@ ynh_add_nginx_config
 # UPGRADE VIA PIP
 #=================================================
 
-ynh_use_nodejs
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading via pip" --weight=1
+    ynh_use_nodejs
     python3 -m venv "${final_path}/venv"
     cp ../conf/requirements.txt "$final_path/requirements.txt"
     chown -R "$app" "$final_path"
@@ -121,7 +121,9 @@ then
 
     # rerun archivebox setup (its idempotent, so it should be ok during upgrade)
     ynh_script_progression --message="Finishing Archivebox Setup" --weight=1
-    cd $datadir && ynh_exec_as $app $ynh_node_load_PATH $archivebox_cmd init --setup
+    pushd $datadir
+    	ynh_exec_as $app $ynh_node_load_PATH $archivebox_cmd init --setup
+    popd
 fi
 
 chmod 750 "$final_path"