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

Improve uninstall()

Browse Source
This commit is contained in:
Bryan Roessler
2021-11-24 15:51:49 -05:00
parent 48ea1d4a40
commit 0899b0e70b
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
installJRMC
View File

@@ -298,7 +298,7 @@ parseInput() {
####################################### #######################################
# Uses several methods to determine the latest JRiver MC version # Use several methods to determine the latest JRiver MC version
####################################### #######################################
getLatestVersion() { getLatestVersion() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
@@ -1139,9 +1139,6 @@ service_jriver-createrepo() {
# } # }
#######################################
# Complete uninstall
#######################################
uninstall() { uninstall() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
@@ -1175,11 +1172,11 @@ uninstall() {
echo "Removing firewall rules" echo "Removing firewall rules"
if [[ -x $(command -v firewall-cmd) ]]; then if [[ -x $(command -v firewall-cmd) ]]; then
firewall_cmd --permanent --remove-service=jriver firewall_cmd --permanent --remove-service=jriver > /dev/null 2>&1
firewall_cmd --permanent --delete-service=jriver firewall_cmd --permanent --delete-service=jriver > /dev/null 2>&1
firewall_cmd --reload firewall_cmd --reload
elif [[ -x $(command -v ufw) ]]; then elif [[ -x $(command -v ufw) ]]; then
firewall_cmd delete allow jriver firewall_cmd delete allow jriver > /dev/null 2>&1
[[ -f "/etc/ufw/applications.d/jriver" ]] \ [[ -f "/etc/ufw/applications.d/jriver" ]] \
&& rm_cmd /etc/ufw/applications.d/jriver && rm_cmd /etc/ufw/applications.d/jriver
fi fi