--mobyvm: copy logfile to ~/.cache/x11docker #219

mviereck · Feb 19, 2020 · 16450e2 · 16450e2
1 parent 19ab2ef
commit 16450e2
Showing 1 changed file with 10 additions and 5 deletions.
diff --git 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,18 +3479,18 @@ 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
       echo           "# background color"
       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 ""