Remove pesky legacy cmds

This commit is contained in:
2022-01-12 11:55:25 -05:00
parent 73f15fa946
commit 52a5734ee2

View File

@@ -1299,7 +1299,7 @@ uninstall() {
fi fi
done done
for f in "$SERVICE_FNAME" "$TIMER_FNAME"; do for f in "$SERVICE_FNAME" "$TIMER_FNAME"; do
[[ -f "$f" ]] && debug "Removing $f" && rm_cmd "$f" [[ -f "$f" ]] && debug "Removing $f" && sudo rm -f "$f"
done done
SERVICE_TYPE=user setServiceVars "$service"; SERVICE_TYPE=user setServiceVars "$service";
for unit in "$SERVICE_NAME" "$TIMER_NAME"; do for unit in "$SERVICE_NAME" "$TIMER_NAME"; do
@@ -1310,16 +1310,16 @@ uninstall() {
fi fi
done done
for f in "$SERVICE_FNAME" "$TIMER_FNAME"; do for f in "$SERVICE_FNAME" "$TIMER_FNAME"; do
[[ -f "$f" ]] && debug "Removing $f" && rm_cmd "$f" [[ -f "$f" ]] && debug "Removing $f" && sudo rm -f "$f"
done done
systemctl_reload_cmd systemctl_reload_cmd
done done
debug "Removing repo files" debug "Removing repo files"
[[ -f "/etc/yum.repos.d/jriver.repo" ]] && [[ -f "/etc/yum.repos.d/jriver.repo" ]] &&
rm_cmd "/etc/yum.repos.d/jriver.repo" sudo rm -f "/etc/yum.repos.d/jriver.repo"
[[ -f "/etc/apt/sources.list.d/jriver.list" ]] && [[ -f "/etc/apt/sources.list.d/jriver.list" ]] &&
rm_cmd "/etc/apt/sources.list.d/jriver.list" sudo rm -f "/etc/apt/sources.list.d/jriver.list"
if [[ "$ID" =~ ^opensuse.* ]]; then if [[ "$ID" =~ ^opensuse.* ]]; then
sudo zypper rr jriver &>/dev/null sudo zypper rr jriver &>/dev/null
fi fi
@@ -1343,7 +1343,7 @@ uninstall() {
debug "$firewall_cmd" || firewall_cmd+=" &>/dev/null" debug "$firewall_cmd" || firewall_cmd+=" &>/dev/null"
eval "$firewall_cmd" eval "$firewall_cmd"
[[ -f "/etc/ufw/applications.d/jriver" ]] && [[ -f "/etc/ufw/applications.d/jriver" ]] &&
rm_cmd /etc/ufw/applications.d/jriver sudo rm -f /etc/ufw/applications.d/jriver
fi fi
debug "Uninstalling Media Center package" debug "Uninstalling Media Center package"