fixes for XAUTHORITY check #81

mviereck · Oct 18, 2018 · d09cbd4 · d09cbd4
1 parent 80bc1f3
commit d09cbd4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/x11docker b/x11docker
@@ -5048,15 +5048,17 @@ check_hostxenv() {              # check environment variables for host X display
   }
 
   # get cookie from host display
-  Hostxauthority=${XAUTHORITY:-}
-  [ -z "$Hostxauthority" ] && Hostxauthority="$(systemctl --user show-environment | grep XAUTHORITY= | cut -d= -f2)"
-  [ -z "$Hostxauthority" ] && [ -e "$Hostuserhome/.Xauthority" ] && Hostxauthority="$Hostuserhome/.Xauthority"
+  XAUTHORITY=${XAUTHORITY:-}
+  [ -z "$XAUTHORITY" ] && XAUTHORITY="$(systemctl --user show-environment | grep XAUTHORITY= | cut -d= -f2)"
+  [ -z "$XAUTHORITY" ] && [ -e "$Hostuserhome/.Xauthority" ] && XAUTHORITY="$Hostuserhome/.Xauthority"
   [ "${XAUTHORITY:-}" ] && {
     $Mksu "$Xauthexe -i -f ${XAUTHORITY:-} nlist $Hostdisplay 2>/dev/null | rmcr | $Xauthexe -f $Hostxauthority nmerge - 2>/dev/null"
     chown $Hostuser $Hostxauthority
     chmod 600 $Hostxauthority
+    export XAUTHORITY
   } || {
     Hostxauthority=""
+    unset XAUTHORITY
   }
   [ "$Hostdisplay" ] || {
     Hostxsocket=""