bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Fix services uninstall

Browse Source
This commit is contained in:
Bryan Roessler
2021-12-01 14:43:19 -05:00
parent 05fba4dc88
commit 1a30a35057
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
installJRMC
View File

@@ -890,7 +890,7 @@ setServiceVars() {
_service_fname="/usr/lib/systemd/system/${1}.service" _service_fname="/usr/lib/systemd/system/${1}.service"
_timer_fname="/usr/lib/systemd/system/${1}.timer" _timer_fname="/usr/lib/systemd/system/${1}.timer"
_service_name="jriver-${1}.service" _service_name="jriver-${1}.service"
_timer_name="jriver-${1}}.timer" _timer_name="jriver-${1}.timer"
_user_specifier="" _user_specifier=""
else else
_service_fname="/usr/lib/systemd/system/${1}@.service" _service_fname="/usr/lib/systemd/system/${1}@.service"
@@ -1153,13 +1153,14 @@ uninstall() {
for _service in $(compgen -A "function" "service"); do for _service in $(compgen -A "function" "service"); do
_service="${_service##service_}" _service="${_service##service_}"
setServiceVars "$_service" setServiceVars "$_service"
for unit in "$_service."{service,timer}; do for unit in "$_service_name."{service,timer} "$_service_name@$_service_user."{service,timer}; do
if systemctl is-active -q "$unit" > /dev/null 2>&1 || systemctl is-enabled -q "$unit" > /dev/null 2>&1; then if systemctl is-active -q "$unit" > /dev/null 2>&1 || systemctl is-enabled -q "$unit" > /dev/null 2>&1; then
debug "Disabling $unit" debug "Disabling $unit"
systemctl_disable "$unit" systemctl_disable "$unit"
fi fi
done done
for f in "$_service_fname" "$_timer_fname"; do for f in "/usr/lib/systemd/system/${_service_name}."{service,timer} \
"/usr/lib/systemd/system/${_service_name}@${_service_user}."{service,timer}; do
debug "Removing $f" debug "Removing $f"
rm_cmd "$f" rm_cmd "$f"
done done