From 89669d24ab879a975edd7ef72b8de1870f14923a Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 23 Dec 2020 22:32:02 +0100
Subject: [PATCH] Fix

---
 scripts/install |  9 +++++----
 scripts/upgrade | 23 +++++++++++++----------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/scripts/install b/scripts/install
index 13e5d35..059be9a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -97,7 +97,7 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 #ynh_setup_source --dest_dir="$final_path"
 
 #git clone --branch master git://github.com/ether/etherpad-lite.git "$final_path" --quiet
-git clone --branch master https://github.com/ether/etherpad-lite.git "$final_path" --quiet && cd "$final_path" && bin/run.sh
+git clone --branch master https://github.com/ether/etherpad-lite.git "$final_path" --quiet
 
 #=================================================
 # NGINX CONFIGURATION
@@ -122,11 +122,12 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 
 # chown -R $app: $final_path
 
-# pushd "$final_path" || ynh_die
-#  	ynh_use_nodejs
+pushd "$final_path" || ynh_die
+  	ynh_use_nodejs
+	ynh_exec_as $app bin/run.sh
 #  	ynh_exec_as $app env "$ynh_node_load_PATH" bin/installDeps.sh
 
-# popd || ynh_die
+ popd || ynh_die
 
 #=================================================
 # MODIFY A CONFIG FILE
diff --git a/scripts/upgrade b/scripts/upgrade
index 4503d4a..3c672c9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -82,7 +82,10 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path"
+	pushd "$final_path"
+		git pull origin
+		ynh_exec_as $app bin/run.sh
+	popd
 fi
 
 #=================================================
@@ -110,17 +113,17 @@ ynh_script_progression --message="Making sure dedicated system user exists..." -
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app
 
-#=================================================
-# INSTALL ETHERPAD
-#=================================================
-ynh_script_progression --message="Installing Etherpad..." --weight=90
+# #=================================================
+# # INSTALL ETHERPAD
+# #=================================================
+# ynh_script_progression --message="Installing Etherpad..." --weight=90
 
-chown -R $app: $final_path
+# chown -R $app: $final_path
 
-pushd "$final_path" || ynh_die
- 	ynh_use_nodejs
- 	ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
-popd || ynh_die 
+# pushd "$final_path" || ynh_die
+#  	ynh_use_nodejs
+#  	ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
+# popd || ynh_die 
 
 #=================================================
 # MODIFY A CONFIG FILE