From cd708168331cbf0365b43cf57be61c1ee0bba352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 21 Jun 2021 15:15:03 +0200
Subject: [PATCH] Testing (#61)

* Update config.json.example

* Cleaning up
---
 conf/config.json.example | 1 -
 scripts/install          | 2 +-
 scripts/restore          | 3 ---
 scripts/upgrade          | 4 ++--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/conf/config.json.example b/conf/config.json.example
index d361583..1b80da5 100644
--- a/conf/config.json.example
+++ b/conf/config.json.example
@@ -3,7 +3,6 @@
         "protocolUseSSL": true,
         "domain": "__DOMAIN__",
         "port": "__PORT__",
-        "urlPath": "__PATH__",
         "loglevel": "info",
         "useCDN": false,
         "allowGravatar": false,
diff --git a/scripts/install b/scripts/install
index 655d5ac..b1a3e19 100644
--- a/scripts/install
+++ b/scripts/install
@@ -129,8 +129,8 @@ ynh_script_progression --message="Modifying a config file..."
 
 path=${path_url:1}
 ynh_add_config --template="../conf/config.json.example" --destination="$final_path/config.json"
-ynh_add_config --template="../conf/.sequelizerc.example" --destination="$final_path/.sequelizerc"
 chmod 600 $final_path/config.json
+ynh_add_config --template="../conf/.sequelizerc.example" --destination="$final_path/.sequelizerc"
 chmod 600 $final_path/.sequelizerc
 
 chmod +x $final_path/app.js
diff --git a/scripts/restore b/scripts/restore
index 9cd1a86..6f18d0d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -84,9 +84,6 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 # Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
-# Install Yarn
-ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
-
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 5dc0268..62f8620 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -133,11 +133,11 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Building CodiMD... (this will take some time and resources!)" --weight=16
 
-	pushd "$final_path" || ynh_die
+	pushd "$final_path"
 		ynh_use_nodejs
 		ynh_exec_warn_less bin/setup
 		ynh_exec_warn_less ynh_npm run build
-	popd || ynh_die
+	popd
 fi
 
 #=================================================