Fix systemd user

installJRMC

@@ -253,7 +253,7 @@ EOF
 
         _install_cmd_nogpg=("${_install_cmd[@]}" "--nogpgcheck")
 
-        # append sudo to non-containers and non-root users
+        # append sudo for non-root users
         if [[ "$_user" != "root" ]]; then
             _install_cmd=("sudo" "${_install_cmd[@]}")
             _install_cmd_nogpg=("sudo" "${_install_cmd_nogpg[@]}")
@@ -631,23 +631,18 @@ EOF"
         # RHEL
         if [[ "$ID" == "fedora" || "$ID" == "centos" ]] && [[ -x $(command -v firewall-cmd) ]]; then
             if ! firewall-cmd --get-services | grep -q jriver; then
-                # 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"
-            fi
-
-            # Enable service
                 if [[ "$_user" == "root" ]]; then
-                firewall-cmd --permanent --add-service=jriver
+                    _firewallcmd=("firewall-cmd")
                 else
-                sudo firewall-cmd --permanent --add-service=jriver
+                    _firewallcmd=("sudo" "firewall-cmd")
+                fi
+                # shellcheck disable=SC2140,SC1079,SC1078
+                "${_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
 
         # Ubuntu
@@ -722,7 +717,7 @@ EOF"
             fi
             _service_fname="$HOME/.config/systemd/user/$1.service"
             _timer_fname="$HOME/.config/systemd/user/$1.timer"
-            _systemd_user="User=$_user"
+            #_systemd_user="User=$_user"
         fi
     }
 
@@ -731,14 +726,13 @@ EOF"
 
         _generateServiceVars "jriver-mediaserver"
 
-        "${_bash_cmd[@]}" "cat <<-EOF > $_service_fname
+        bash -c "cat <<-EOF > $_service_fname
 [Unit]
 Description=JRiver Media Center $_mversion Media Server
 After=graphical.target
 
 [Service]
 Type=simple
-$_systemd_user
 Environment=DISPLAY=$_display
 ExecStart=/usr/bin/mediacenter$_mversion /MediaServer
 Restart=always
@@ -766,14 +760,13 @@ EOF"
             _exec_start_cmd="/usr/bin/x11vnc -display $_display -geometry 1920x1080 -rfbauth $HOME/.vnc/jrmc_passwd -auth guess -forever -bg"
         fi
 
-        "${_bash_cmd[@]}" "cat <<-EOF > $_service_fname
+        bash -c "cat <<-EOF > $_service_fname
 [Unit]
 Description=x11vnc
 After=display-manager.service
 
 [Service]
 Type=forking
-$_systemd_user
 Environment=DISPLAY=$_display
 ExecStart=$_exec_start_cmd
 Restart=always
@@ -790,18 +783,17 @@ EOF"
 
         _generateServiceVars "jriver-createrepo"
 
-        "${_bash_cmd[@]}" "cat <<-EOF > $_service_fname
+        bash -c "cat <<-EOF > $_service_fname
 [Unit]
 Description=Builds JRiver Media Center RPM file, moves it to the repo dir, and runs createrepo
 
 [Service]
-$_systemd_user
 ExecStart=$_basedir/installJRMC --buildpath=$_outputdir --createrepo --createrepo-webroot $_createrepo_webroot --createrepo-user $_createrepo_user
 
 [Install]
 WantedBy=multi-user.target
 EOF"
-        "${_bash_cmd[@]}" "cat <<-EOF > $_timer_fname
+        bash -c "cat <<-EOF > $_timer_fname
 [Unit]
 Description=Run JRiver MC rpmbuild hourly
 
@@ -894,21 +886,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 +901,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