From 35cdc00219749fb4abda7eb774dff54733289e04 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 7 Jun 2021 21:09:21 +0200 Subject: [PATCH] Fix absent-mindedness Co-authored-by: Alexandre Aubin --- scripts/install | 4 ++-- scripts/remove | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 8d98100..f6ac0bb 100644 --- a/scripts/install +++ b/scripts/install @@ -93,7 +93,7 @@ if [ $discovery -eq 1 ]; then discovery_client=0 ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless." fi - ynh_app_setting_set --app=$app --key=discovery_service --value=$discovery_client + ynh_app_setting_set --app=$app --key=discovery_client --value=$discovery_client fi #================================================= @@ -202,7 +202,7 @@ ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 # Build the ports list needed_ports=() -(( $discovery_server == 1 )) && needed_ports+=( "$discovery_server_port" ) +(( $discovery_service == 1 )) && needed_ports+=( "$discovery_service_port" ) (( $discovery_client == 1 )) && needed_ports+=( "$discovery_client_port" ) # Integrate service and require to expose the ports if needed diff --git a/scripts/remove b/scripts/remove index 83a3d43..a9ab3db 100644 --- a/scripts/remove +++ b/scripts/remove @@ -18,7 +18,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) discovery_client=$(ynh_app_setting_get --app=$app --key=discovery_client) -discovery_server=$(ynh_app_setting_get --app=$app --key=discovery_server) +discovery_service=$(ynh_app_setting_get --app=$app --key=discovery_service) final_path=$(ynh_app_setting_get --app=$app --key=final_path) config_path=$(ynh_app_setting_get --app=$app --key=config_path) @@ -74,7 +74,7 @@ ynh_remove_logrotate # CLOSE A PORT #================================================= -if [[ $discovery_server -eq 1 ]] && yunohost firewall list | grep -q "\- 1900$" +if [[ $discovery_service -eq 1 ]] && yunohost firewall list | grep -q "\- 1900$" then ynh_script_progression --message="Closing port 1900..." --time --weight=1 ynh_exec_warn_less yunohost firewall disallow UDP 1900 diff --git a/scripts/restore b/scripts/restore index 78a517c..d44c8ed 100644 --- a/scripts/restore +++ b/scripts/restore @@ -77,7 +77,7 @@ if [ $discovery -eq 1 ]; then discovery_client=0 ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless." fi - ynh_app_setting_set --app=$app --key=discovery_service --value=$discovery_client + ynh_app_setting_set --app=$app --key=discovery_client --value=$discovery_client fi #================================================= @@ -141,7 +141,7 @@ ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 # Build the ports list needed_ports=() -(( $discovery_server == 1 )) && needed_ports+=( "$discovery_server_port" ) +(( $discovery_service == 1 )) && needed_ports+=( "$discovery_service_port" ) (( $discovery_client == 1 )) && needed_ports+=( "$discovery_client_port" ) # Integrate service and require to expose the ports if needed diff --git a/scripts/upgrade b/scripts/upgrade index d1f8335..b57c1b1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,7 +112,7 @@ if [ $discovery -eq 1 ]; then discovery_client=0 ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless." fi - ynh_app_setting_set --app=$app --key=discovery_service --value=$discovery_client + ynh_app_setting_set --app=$app --key=discovery_client --value=$discovery_client fi #================================================= @@ -233,7 +233,7 @@ ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 # Build the ports list needed_ports=() -(( $discovery_server == 1 )) && needed_ports+=( "$discovery_server_port" ) +(( $discovery_service == 1 )) && needed_ports+=( "$discovery_service_port" ) (( $discovery_client == 1 )) && needed_ports+=( "$discovery_client_port" ) # Integrate service and require to expose the ports if needed