From 0899b0e70bc5379890765504ea252869c49bcf04 Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Wed, 24 Nov 2021 15:51:49 -0500
Subject: [PATCH] Improve uninstall()

---
 installJRMC | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/installJRMC b/installJRMC
index 15df05f..d28bcec 100755
--- a/installJRMC
+++ b/installJRMC
@@ -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() {
     debug "Running: ${FUNCNAME[0]}"
@@ -1139,9 +1139,6 @@ service_jriver-createrepo() {
 # }
 
 
-#######################################
-# Complete uninstall
-#######################################
 uninstall() {
     debug "Running: ${FUNCNAME[0]}"
 
@@ -1175,11 +1172,11 @@ uninstall() {
 
     echo "Removing firewall rules"
     if [[ -x $(command -v firewall-cmd) ]]; then
-        firewall_cmd --permanent --remove-service=jriver
-        firewall_cmd --permanent --delete-service=jriver
+        firewall_cmd --permanent --remove-service=jriver > /dev/null 2>&1
+        firewall_cmd --permanent --delete-service=jriver > /dev/null 2>&1
         firewall_cmd --reload
     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" ]] \
             && rm_cmd /etc/ufw/applications.d/jriver
     fi