diff --git a/scripts/remove b/scripts/remove index ba1f9ff..b95a8ed 100644 --- a/scripts/remove +++ b/scripts/remove @@ -9,7 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers - #================================================= # STANDARD REMOVE #================================================= @@ -17,22 +16,22 @@ source /usr/share/yunohost/helpers #================================================= # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status "${app}-server" >/dev/null +if ynh_exec_warn_less yunohost service status "$app-server" >/dev/null then - ynh_script_progression --message="Removing ${app}-server service integration..." - yunohost service remove "${app}-server" + ynh_script_progression --message="Removing $app-server service integration..." + yunohost service remove "$app-server" fi -if ynh_exec_warn_less yunohost service status "${app}-worker" >/dev/null +if ynh_exec_warn_less yunohost service status "$app-worker" >/dev/null then - ynh_script_progression --message="Removing ${app}-worker service integration..." - yunohost service remove "${app}-worker" + ynh_script_progression --message="Removing $app-worker service integration..." + yunohost service remove "$app-worker" fi -if ynh_exec_warn_less yunohost service status "${app}-beat" >/dev/null +if ynh_exec_warn_less yunohost service status "$app-beat" >/dev/null then - ynh_script_progression --message="Removing ${app}-beat service integration..." - yunohost service remove "${app}-beat" + ynh_script_progression --message="Removing $app-beat service integration..." + yunohost service remove "$app-beat" fi #================================================= @@ -45,9 +44,9 @@ ynh_systemd_action --service_name="$app-server" --action="stop" --log_path="syst ynh_systemd_action --service_name="$app-worker" --action="stop" --log_path="systemd" --line_match="Stopped $app" # Remove the dedicated systemd config -ynh_remove_systemd_config --service="$app-beat" --log="/var/log/$app/$app-beat.log" -ynh_remove_systemd_config --service="$app-server" --log="/var/log/$app/$app.log" -ynh_remove_systemd_config --service="$app-worker" --log="/var/log/$app/$app-worker.log" +ynh_remove_systemd_config --service="$app-beat" +ynh_remove_systemd_config --service="$app-server" +ynh_remove_systemd_config --service="$app-worker" ynh_secure_remove --file="/etc/systemd/system/$app.target"