From d5d51ab50608d11954032f20935f64524dd33a97 Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Fri, 3 Apr 2020 13:05:11 -0400
Subject: [PATCH] Use firewall-cmd to avoid 5 second delay for xml file to load

---
 installJRMC | 60 +++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/installJRMC b/installJRMC
index 167d6f5..97adfce 100755
--- a/installJRMC
+++ b/installJRMC
@@ -631,25 +631,20 @@ EOF"
         # RHEL
         if [[ "$ID" == "fedora" || "$ID" == "centos" ]] && [[ -x $(command -v firewall-cmd) ]]; then
             if ! firewall-cmd --get-services | grep -q jriver; then
+                if [[ "$_user" == "root" ]]; then
+                    _firewallcmd=("firewall-cmd")
+                else
+                    _firewallcmd=("sudo" "firewall-cmd")
+                fi
                 # shellcheck disable=SC2140,SC1079,SC1078
-                "${_bash_cmd[@]}" "cat <<-EOF > /etc/firewalld/services/jriver.xml
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <short>jriver</short>
-  <description>JRiver Media Center Media Server</description>
-  <port protocol="udp" port="1900" />
-  <port protocol="tcp" port="52100-52200"/>
-</service>
-EOF"
+                "${_firewallcmd[@]}" --permanent --new-service=jriver
+                "${_firewallcmd[@]}" --permanent --service=jriver --set-description="JRiver Media Center Media Server"
+                "${_firewallcmd[@]}" --permanent --service=jriver --set-short="jriver"
+                "${_firewallcmd[@]}" --permanent --service=jriver --add-port=52100-52200/tcp
+                "${_firewallcmd[@]}" --permanent --service=jriver --add-port=1900/udp
+                "${_firewallcmd[@]}" --reload
             fi
-
-            # Enable service
-            if [[ "$_user" == "root" ]]; then
-                firewall-cmd --permanent --add-service=jriver
-            else
-                sudo firewall-cmd --permanent --add-service=jriver
-            fi
-
+            
         # Ubuntu
         elif [[ "$ID" == "ubuntu" && -x $(command -v ufw) ]]; then
             if [[ ! -f "/etc/ufw/applications.d/jriver.service" ]]; then
@@ -894,21 +889,6 @@ EOF"
             return $?
         fi
 
-        # Install MC systemd services
-        if [[ -n $_service_xms ]]; then
-            _serviceMediaserver
-            _serviceX11VNC
-        fi
-
-        if [[ -n $_service_ms ]]; then
-            _serviceMediaserver
-        fi
-
-        # Install createrepo systemd service
-        if [[ -n $_service_createrepo ]]; then
-            _serviceCreaterepo
-        fi
-
         # Acquire source deb package
         _acquireDeb
 
@@ -924,11 +904,27 @@ EOF"
             return $?
         fi
 
+        # Install createrepo systemd service
+        if [[ -n $_service_createrepo ]]; then
+            _serviceCreaterepo
+        fi
+
+
         # install MC
         _installRPM
         _symlinkCerts
         _restoreLicense
         _openFirewallPorts
+
+        # Install MC systemd services
+        if [[ -n $_service_xms ]]; then
+            _serviceMediaserver
+            _serviceX11VNC
+        fi
+
+        if [[ -n $_service_ms ]]; then
+            _serviceMediaserver
+        fi
     }
 
     # Execute function when called