From c59f779a9bee48a0cd22a9e2348b5d628bf98ca7 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 28 Nov 2019 10:29:55 +0100 Subject: [PATCH] Update remove --- scripts/remove | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/remove b/scripts/remove index 45b34e8..1c60fab 100644 --- a/scripts/remove +++ b/scripts/remove @@ -15,10 +15,10 @@ ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get $app domain) +domain=$(ynh_app_setting_get "$app" domain) db_name=$app db_user=$app -final_path=$(ynh_app_setting_get $app final_path) +final_path=$(ynh_app_setting_get "$app" final_path) #================================================= # STANDARD REMOVE @@ -27,10 +27,10 @@ final_path=$(ynh_app_setting_get $app final_path) #================================================= # Remove a service from the admin panel, added by `yunohost service add` -if yunohost service status $app >/dev/null 2>&1 +if yunohost service status "$app" >/dev/null 2>&1 then ynh_script_progression --message="Removing $app service" - yunohost service remove $app + yunohost service remove "$app" fi #================================================= @@ -47,7 +47,7 @@ ynh_remove_systemd_config ynh_script_progression --message="Removing the PostgreSQL database" # Remove a database if it exists, along with the associated user -ynh_psql_remove_db $db_name $db_name +ynh_psql_remove_db "$db_name" "$db_name" #================================================= # REMOVE DEPENDENCIES @@ -81,7 +81,7 @@ ynh_remove_nginx_config ynh_script_progression --message="Removing the dedicated system user" # Delete a system user -ynh_system_user_delete $app +ynh_system_user_delete "$app" #================================================= # END OF SCRIPT