From b8a1a3a660222cb251b95d269b6d9f5164458850 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 19 Jun 2024 23:45:37 +0200 Subject: [PATCH] helpers2.1: ynh_config_remove_systemd now uses positional --- helpers/helpers.v2.1.d/systemd | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/helpers/helpers.v2.1.d/systemd b/helpers/helpers.v2.1.d/systemd index 99bf9c15a..b7aa0508e 100644 --- a/helpers/helpers.v2.1.d/systemd +++ b/helpers/helpers.v2.1.d/systemd @@ -30,23 +30,14 @@ ynh_config_add_systemd() { # Remove the dedicated systemd config # -# usage: ynh_config_remove_systemd [--service=service] -# | arg: -s, --service= - Service name (optionnal, $app by default) -# -# Requires YunoHost version 2.7.2 or higher. +# usage: ynh_config_remove_systemd service +# | arg: service - Service name (optionnal, $app by default) ynh_config_remove_systemd() { - # ============ Argument parsing ============= - local -A args_array=([s]=service=) - local service - ynh_handle_getopts_args "$@" - local service="${service:-$app}" - # =========================================== - - local finalsystemdconf="/etc/systemd/system/$service.service" - if [ -e "$finalsystemdconf" ]; then + local service="${1:-$app}" + if [ -e "/etc/systemd/system/$service.service" ]; then ynh_systemd_action --service=$service --action=stop systemctl disable $service --quiet - ynh_safe_rm "$finalsystemdconf" + ynh_safe_rm "/etc/systemd/system/$service.service" systemctl daemon-reload fi }