From 05f9699eae0aceaa1147d5d10033983ea927c6f6 Mon Sep 17 00:00:00 2001
From: gredin67 <gredin67@sans-nuage.fr>
Date: Thu, 19 Jan 2023 20:40:42 +0100
Subject: [PATCH] should work...

---
 scripts/upgrade | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index e8b0728..8db8256 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -52,22 +52,9 @@ enable_relaybot=$(ynh_app_setting_get --app=$app --key=enable_relaybot)
 admin_only=$(ynh_app_setting_get --app=$app --key=admin_only)
 print_level=$(ynh_app_setting_get --app=$app --key=print_level)
 
-listrelay_backup=$(ynh_app_setting_get --app=$app --key=listrelay)
-listuser_backup=$(ynh_app_setting_get --app=$app --key=listuser)
-listadmin_backup=$(ynh_app_setting_get --app=$app --key=listadmin)
-
-# reset permissions to be able to apply_permissions with app_setting values after upgrade
-listrelay="*"
-listuser="@user:domain.tld"
-listadmin="@admin:domain.tld"
-yunohost app config set mautrix_whatsapp main.permissions.listrelay
-yunohost app config set mautrix_whatsapp main.permissions.listuser
-yunohost app config set mautrix_whatsapp main.permissions.listadmin
-#ynh_store_file_checksum --file="$final_path/config.yaml"
-
-listrelay=$listrelay_backup
-listuser=$listrelay_backup
-listadmin=$listrelay_backup
+listrelay=$(ynh_app_setting_get --app=$app --key=listrelay)
+listuser=$(ynh_app_setting_get --app=$app --key=listuser)
+listadmin=$(ynh_app_setting_get --app=$app --key=listadmin)
 
 #=================================================
 # CHECK VERSION
@@ -264,11 +251,29 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 ynh_script_progression --message="Updating a configuration file..." --weight=2
 
+listrelay_=$listrelay
+listuser_=$listuser
+listadmin_=$listadmin
+
+# reset permissions to be able to apply_permissions with app_setting values after upgrade
+listrelay="*"
+listuser="@user:domain.tld"
+listadmin="@admin:domain.tld"
+
 ynh_add_config --template="../conf/config.yaml" --destination="$final_path/config.yaml"
 
 chmod 400 "$final_path/config.yaml"
 chown $app:$app "$final_path/config.yaml"
 
+yunohost app config set mautrix_whatsapp main.permissions.listrelay
+yunohost app config set mautrix_whatsapp main.permissions.listuser
+yunohost app config set mautrix_whatsapp main.permissions.listadmin
+#ynh_store_file_checksum --file="$final_path/config.yaml"
+
+listrelay=$listrelay_
+listuser=$listuser_
+listadmin=$listadmin_
+
 # apply_permissions to have correct syntax in config file
 yunohost app config set mautrix_whatsapp main.permissions.listrelay
 yunohost app config set mautrix_whatsapp main.permissions.listuser