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

Fix firewall uninstall

Browse Source
This commit is contained in:
Bryan Roessler
2024-12-20 11:22:18 -05:00
parent af22dc1aa5
commit a70898f6cc
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
installJRMC
View File

@@ -1143,13 +1143,13 @@ restore_license() {
# @arg $2 array List of ports in firewall-cmd format # @arg $2 array List of ports in firewall-cmd format
open_firewall() { open_firewall() {
debug "Running: ${FUNCNAME[0]}" "$*" debug "Running: ${FUNCNAME[0]}" "$*"
local port
local service="$1" local service="$1"
shift shift
local -a f_ports=("$@") # for firewall-cmd local -a f_ports=("$@") # for firewall-cmd
local u_ports="$*" local u_ports="$*"
u_ports="${u_ports// /|}" # concatenate u_ports="${u_ports// /|}" # concatenate
u_ports="${u_ports//-/\:}" # for ufw u_ports="${u_ports//-/\:}" # for ufw
local port
if command -v firewall-cmd &>/dev/null; then if command -v firewall-cmd &>/dev/null; then
if ! sudo firewall-cmd --get-services | grep -q "$service"; then if ! sudo firewall-cmd --get-services | grep -q "$service"; then
@@ -1530,15 +1530,17 @@ uninstall() {
fi fi
echo "Removing firewall rules" echo "Removing firewall rules"
if command -v firewall-cmd &>/dev/null; then for service in jriver-mediacenter jriver-xvnc jriver-x11vnc; do
execute sudo firewall-cmd --permanent --remove-service=jriver if command -v firewall-cmd &>/dev/null; then
execute sudo firewall-cmd --permanent --delete-service=jriver execute sudo firewall-cmd --permanent --remove-service=$service
execute sudo firewall-cmd --reload execute sudo firewall-cmd --permanent --delete-service=$service
elif command -v ufw &>/dev/null; then execute sudo firewall-cmd --reload
execute sudo ufw delete allow jriver elif command -v ufw &>/dev/null; then
[[ -f "/etc/ufw/applications.d/jriver" ]] && execute sudo ufw delete allow $service
execute sudo rm -f /etc/ufw/applications.d/jriver [[ -f /etc/ufw/applications.d/$service ]] &&
fi execute sudo rm -f /etc/ufw/applications.d/$service
fi
done
echo "Uninstalling JRiver Media Center package" echo "Uninstalling JRiver Media Center package"
if "${PKG_REMOVE[@]}" "${MC_PKG%%=*}"; then # remove version specifier if "${PKG_REMOVE[@]}" "${MC_PKG%%=*}"; then # remove version specifier