From 2e7d769d9ff632fee1a11607cc8316a8fc2bf396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 15 Mar 2023 23:05:19 +0100
Subject: [PATCH] Cleaning

---
 doc/ADMIN.md        | 6 +++---
 doc/ADMIN_fr.md     | 4 ++--
 doc/POST_INSTALL.md | 2 +-
 scripts/install     | 1 -
 scripts/upgrade     | 9 +--------
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index fe39275..5da4152 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -1,9 +1,9 @@
 ## Configuration
 
-You can access two different admin panels, for Etherpad by accessing `domain.tld/admin` and for MyPads by `domain.tld/mypads/?/admin`. 
-You can also find a configuration file for Etherpad at this path `/var/www/etherpad_mypads/settings.json`.
+You can access two different admin panels, for Etherpad by accessing `__DOMAIN____PATH__/admin` and for MyPads by `__DOMAIN____PATH__/mypads/?/admin`. 
+You can also find a configuration file for Etherpad at this path `__INSTALL_DIR__/settings.json`.
 
-*Skin Builder* (accessible at this address `domain.tld/pad/p/test#skinvariantsbuilder`) allows you to customize the skin of your pad. It will give you a parameter to copy into your configuration file `/var/www/etherpad_mypads/settings.json`.
+*Skin Builder* (accessible at this address `https://__DOMAIN____PATH__/pad/p/test#skinvariantsbuilder`) allows you to customize the skin of your pad. It will give you a parameter to copy into your configuration file `__INSTALL_DIR__/settings.json`.
 
 ## YunoHost specific features
 
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index f2fc4e4..0b6adcb 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -1,8 +1,8 @@
 ## Configuration
 
-Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpad en accédant à `domain.tld/admin` et pour MyPads par `domain.tld/mypads/?/admin`. Vous pouvez également trouver le fichier de configuration pour Etherpad à `/var/www/etherpad_mypads/settings.json`.
+Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpad en accédant à `__DOMAIN____PATH__/admin` et pour MyPads par `domain.tld/mypads/?/admin`. Vous pouvez également trouver le fichier de configuration pour Etherpad à `__INSTALL_DIR__/settings.json`.
 
-*Skin Builder* (accessible à cette adresse `domain.tld/pad/p/test#skinvariantsbuilder`) vous permet de personnaliser l'apparence de votre pad. Il vous donnera un paramètre à copier dans votre fichier de configuration `/var/www/etherpad_mypads/settings.json`.
+*Skin Builder* (accessible à cette adresse `https://__DOMAIN____PATH__/pad/p/test#skinvariantsbuilder`) vous permet de personnaliser l'apparence de votre pad. Il vous donnera un paramètre à copier dans votre fichier de configuration `__INSTALL_DIR__/settings.json`.
 
 ## Fonctionnalités spécifiques à YunoHost
 
diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md
index 90c547e..e413ecd 100644
--- a/doc/POST_INSTALL.md
+++ b/doc/POST_INSTALL.md
@@ -1 +1 @@
-Informations="You can access two different admin panels, for Etherpad by accessing https://$domain${path%/}/admin and for MyPads (if installed) by accessing https://$domain${path%/}/mypads/?/admin."
+Informations="You can access two different admin panels, for Etherpad by accessing https://__DOMAIN____PATH__/admin and for MyPads (if installed) by accessing https://__DOMAIN____PATH__/mypads/?/admin."
diff --git a/scripts/install b/scripts/install
index 7d41267..e7cd541 100644
--- a/scripts/install
+++ b/scripts/install
@@ -67,7 +67,6 @@ ynh_script_progression --message="Setting up source files..." --weight=4
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:$app "$install_dir"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index a403907..a1a806e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -62,12 +62,6 @@ ynh_systemd_action --service_name=$app --action="stop"
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=2
 
-# If db_name doesn't exist, create it
-if [ -z "$db_name" ]; then
-	db_name=$(ynh_sanitize_dbid --db_name=$app)
-#REMOVEME? 	ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-fi
-
 # If abiword setting doesn't exist
 if [ -z "$abiword" ]; then
 	abiword=0
@@ -79,7 +73,7 @@ if [ -n "$abiword" ]; then
 	if [ $abiword -eq 1 ]; then
 		export=abiword
 	fi
-#REMOVEME? 	ynh_app_setting_set --app=$app --key=export --value=$export
+	ynh_app_setting_set --app=$app --key=export --value=$export
 	ynh_app_setting_delete --app=$app --key=abiword
 fi
 
@@ -147,7 +141,6 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --keep="settings.json credentials.json"
 fi
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:$app "$install_dir"