Remove legacy DISPLAY settings for systemd

installJRMC

@@ -16,7 +16,7 @@
 
 shopt -s extglob
 
-declare -g SCRIPT_VERSION="1.3.1"
+declare -g SCRIPT_VERSION="1.3.2-dev"
 declare -g BOARD_URL="https://yabb.jriver.com/interact/index.php/board,86.0.html" # MC33
 declare -g MC_VERSION="33.0.15" # Do find all replace
 declare -g MC_DEFAULT_REPO="bullseye" # should match the MC_VERSION
@@ -103,6 +103,7 @@ print_help() {
 	EOF
 }
 
+
 #######################################
 # Helpers
 #######################################
@@ -682,7 +683,6 @@ acquire_deb() {
 }
 
 
-
 #######################################
 # Creates a SPEC file and builds the RPM from the source DEB using rpmbuild
 #######################################
@@ -1215,7 +1215,7 @@ set_service_vars() {
     debug "Running: ${FUNCNAME[0]}" "$*"
 
     declare -g SERVICE_NAME SERVICE_FNAME TIMER_NAME TIMER_FNAME 
-    declare -g USER_STRING DISPLAY_STRING GRAPHICAL_TARGET
+    declare -g USER_STRING GRAPHICAL_TARGET
     declare -ga RELOAD ENABLE DISABLE IS_ENABLED IS_ACTIVE
     local -a systemctl_prefix
     local service_name="$1"
@@ -1245,16 +1245,6 @@ set_service_vars() {
 
     [[ -d $service_dir ]] || execute sudo mkdir -p "$service_dir"
 
-    # TODO Ubuntu needs these in the service file, fedora (and others?) do not
-    case $ID in
-        ubuntu|debian)
-            DISPLAY_STRING="Environment=XAUTHORITY=${XAUTHORITY:-$(echo /run/user/"$(id -u)"/.mutter*)}"
-            ;;
-        *)
-            DISPLAY_STRING=""
-            ;;
-    esac
-
     if [[ $service_type == "system" && $USER != "root" ]]; then
         SERVICE_FNAME="$service_dir/$service_name@.service"
         TIMER_FNAME="$service_dir/$service_name@.timer"
@@ -1289,8 +1279,6 @@ service_jriver-mediacenter() {
 		[Service]
 		Type=simple
 		$USER_STRING
-		$DISPLAY_STRING
-		Environment=DISPLAY=$THIS_DISPLAY
 		ExecStart=/usr/bin/mediacenter$MC_MVERSION $*
 		KillMode=none
 		ExecStop=/usr/bin/mc$MC_MVERSION /MCC 20007