diff --git a/x11docker b/x11docker index 9f612110..77b3a8fb 100755 --- a/x11docker +++ b/x11docker @@ -631,6 +631,11 @@ finish() { # trap EXIT routine to clean up background proce [ -e "$Logfile" ] && { [ "$Verbose" = "yes" ] && sleep 1 unpriv "cp '$Logfile' '$Logfilebackup'" + case $Winsubsystem in + WSL1|WSL2) + [ "$Mobyvm" = "yes" ] && unpriv "cp -T '$Logfilebackup' '$Hostuserhome/.cache/x11docker/x11docker.log'" + :: + esac #unpriv "rmcr '$Logfilebackup'" } @@ -3474,9 +3479,9 @@ create_xinitrc() { # create xinitrc: set up X environment, create c --runx) [ "$Xauthentication" = "yes" ] && { echo "# cookie generated by runx" - echo "cp \$XAUTHORITY $Xclientcookie" - echo "cp \$XAUTHORITY $Xservercookie" - echo "export XAUTHORITY=$Xclientcookie" + echo "cp -T '\$XAUTHORITY' '$Xclientcookie'" + echo "cp -T '\$XAUTHORITY' '$Xservercookie'" + echo "export XAUTHORITY='$Xclientcookie'" } ;; *) # here something for real X servers @@ -3484,8 +3489,8 @@ create_xinitrc() { # create xinitrc: set up X environment, create c case $Xserver in --hostdisplay) ;; --nxagent) - echo "sleep 2 && xsetroot -solid '#7F7F7F' &" ;; - *) echo "xsetroot -solid '#7F7F7F'" ;; + echo "sleep 2 && xsetroot -solid '#7F7F7F' 2>/dev/null &" ;; + *) echo "xsetroot -solid '#7F7F7F' 2>/dev/null" ;; esac echo ""