From abe4a95b000c82f5a2d0a791dbaf6040a6b659d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 26 Apr 2024 21:57:26 +0200 Subject: [PATCH] Use = intead of space for helper args to avoid issue with parameter --- scripts/_common.sh | 4 ++-- scripts/backup | 4 ++-- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 24ce3ae..b3e64be 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -113,8 +113,8 @@ ensure_vars_set() { 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_domain=$(ynh_app_setting_get --app=$element_instance --key=domain) + element_path=$(ynh_app_setting_get --app=$element_instance --key=path) web_client_location="https://""$element_domain""$element_path" fi ynh_app_setting_set --app="$app" --key=web_client_location --value="$web_client_location" diff --git a/scripts/backup b/scripts/backup index e4675ac..e84aad5 100644 --- a/scripts/backup +++ b/scripts/backup @@ -37,7 +37,7 @@ ynh_backup --src_path="$install_dir" #================================================= # BACKUP THE PHP-FPM CONFIGURATION -ynh_backup --src_path "/etc/php/$phpversion/fpm/pool.d/$app.conf" +ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" if yunohost --output-as plain domain list | grep -q "^$server_name$" @@ -90,7 +90,7 @@ ynh_backup --src_path="/var/log/matrix-$app" --is_big=1 #================================================= # Copy hook -ynh_backup --src_path "/etc/yunohost/hooks.d/post_cert_update/50-$app" +ynh_backup --src_path="/etc/yunohost/hooks.d/post_cert_update/50-$app" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 9d7f46a..2933118 100644 --- a/scripts/install +++ b/scripts/install @@ -171,7 +171,7 @@ configure_coturn #================================================= ynh_script_progression --message="Configuring log rotation..." --weight=2 -ynh_use_logrotate --logfile "/var/log/matrix-$app" +ynh_use_logrotate --logfile="/var/log/matrix-$app" #================================================= # ADD SCRIPT FOR COTURN CRON AND APP SERVICE diff --git a/scripts/restore b/scripts/restore index 0a2c7e5..5e6f5ed 100644 --- a/scripts/restore +++ b/scripts/restore @@ -104,7 +104,7 @@ configure_coturn #================================================= ynh_script_progression --message="Configuring log rotation..." -ynh_use_logrotate --logfile /var/log/matrix-$app +ynh_use_logrotate --logfile=/var/log/matrix-$app #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index e080275..073eb57 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,7 +30,7 @@ if [ -z "${domain:-}" ]; then ynh_app_setting_set --app=$app --key=path --value=$path ynh_app_setting_delete --app=$app --key=special_domain ynh_app_setting_delete --app=$app --key=special_path - ynh_app_setting_set --app=$app --key=no_sso --value true + ynh_app_setting_set --app=$app --key=no_sso --value=true fi ensure_vars_set @@ -187,7 +187,7 @@ then # MAKE A CLEAN LOGROTATE CONFIG #================================================= - ynh_use_logrotate --logfile /var/log/matrix-$app --nonappend + ynh_use_logrotate --logfile=/var/log/matrix-$app --nonappend fi #=================================================