From fa02d4e9c06e9ea0183eb41febf6d83840e4b34f Mon Sep 17 00:00:00 2001
From: gredin67 <gredin67@sans-nuage.fr>
Date: Wed, 11 Jan 2023 17:36:28 +0100
Subject: [PATCH] typo

---
 scripts/install | 10 +++++-----
 scripts/upgrade | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/scripts/install b/scripts/install
index b224b16..ae183a7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -111,11 +111,11 @@ element_ynh_url="https://matrix.to/"
 # Get app name of first Element Instance (can be changed later in Config Panel)
 element_instance="element"
 if yunohost --output-as plain app list | grep -q "^$element_instance$"; then
-element_domain=$(ynh_app_setting_get --app $element_instance --key domain)
-element_path=$(ynh_app_setting_get --app $element_instance --key path)
-element_ynh_url="https://"+element_domain+element_path
-#if [ -z "$element_domain" ]; then
-#    element_ynh_url="https://matrix.to/"    
+    element_domain=$(ynh_app_setting_get --app $element_instance --key domain)
+    element_path=$(ynh_app_setting_get --app $element_instance --key path)
+    element_ynh_url="https://""$element_domain""$element_path"
+    #if [ -z "$element_domain" ]; then
+    #    element_ynh_url="https://matrix.to/"
 fi
 
 web_client_location=$element_ynh_url
diff --git a/scripts/upgrade b/scripts/upgrade
index 6caeb70..bde9cc0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -100,7 +100,7 @@ fi
 #=================================================
 backup_before_upgrade=$(ynh_app_setting_get --app=$app --key=backup_before_upgrade)
 if [ -z "$backup_before_upgrade" ] ; then
-  if $(ynh_app_setting_get --app=$app --key=disable_backup_before_upgrade) ; then
+  if [ $(ynh_app_setting_get --app=$app --key=disable_backup_before_upgrade) ] ; then
   backup_before_upgrade="false"
 fi
 
@@ -113,7 +113,7 @@ ynh_script_progression --message="Backing up the app before upgrading (may take
 ynh_systemd_action --service_name=matrix-$app.service --action=stop
 
 # Backup the current version of the app
-if $backup_before_upgrade ; then
+if [ $backup_before_upgrade ] ; then
     ynh_backup_before_upgrade
     ynh_clean_setup () {
         # Clean installation remainings that are not handled by the remove script.
@@ -212,17 +212,17 @@ fi
 # SET STANDARD SETTINGS FROM DEFAULT CONFIG
 
 # Get app name of first Element Instance
-
+yunohost --output-as plain domain list | grep -q "^$server_name"'$'
 if [ -z "$web_client_location" ]
 then
   element_ynh_url="https://matrix.to/"
   element_instance="element"
-  if yunohost --output-as plain app list | grep -q "^$element_instance$"; then
+  if yunohost --output-as plain app list | grep -q "^$element_instance"'$'; then
     element_domain=$(ynh_app_setting_get --app $element_instance --key domain)
     element_path=$(ynh_app_setting_get --app $element_instance --key path)
   #if [ -z "$element_domain" ]; then
   #else
-    element_ynh_url="https://"+element_domain+element_path
+    element_ynh_url="https://""$element_domain""$element_path"
   fi
   web_client_location=$element_ynh_url
   client_base_url=$element_ynh_url
@@ -303,7 +303,8 @@ then
   ynh_app_setting_set --app=$app --key=enable_group_creation --value=$enable_group_creation
 fi
 
-if [ -z "$enable_registration" ] ; then
+if [ -z "$enable_registration" ]
+then
   if [ $is_free_registration -eq 0 ]
   then
       enable_registration="false"