3.2.0

usernames with spaces (#230) and other chars (#213), #162 generate shortcuts

README.md

@@ -17,6 +17,12 @@ WSLtty components
 
 ---
 
+### Requirement ###
+
+Since release 3.0.5, WSLtty requires Windows version 1809 (the November 2018 release).
+
+---
+
 ### Installation from this repository ###
 
 #### WSLtty installer ([Download](https://github.com/mintty/wsltty/releases) standalone installation) ####
@@ -31,7 +37,7 @@ to enable the “Run anyway” button.
 
 #### Installation from source repository ####
 
-Download or checkout the wsltty repository.
+Checkout the wsltty repository, or download the source archive, unpack and rename the directory to `wsltty`.
 Invoke `make`, then `make install`.
 Note this has to be done within a Cygwin environment.
 
@@ -44,6 +50,9 @@ the optional second parameter designates the configuration directory.
 
 ### Installation with other package management environments ###
 
+Note that these are 3rd-party contributions and do not necessarily 
+provide the latest version.
+
 #### Chocolatey ####
 
 If you use the [Chocolatey package manager](https://chocolatey.org/), 
@@ -79,10 +88,22 @@ WSLtty can be invoked with
 Starting the mintty terminal directly from the WSLtty installation location 
 is discouraged because that would bypass essential options.
 
-#### WSL 2 ####
+#### WSL V2 ####
 
-The new wslbridge2 gateway provides two versions, for WSL V1 and V2 mode, respectively.
+Terminal communication with WSL via its modes V1 or V2 is handled 
-Mintty automatically detects the WSL version and invokes the proper gateway.
+automatically by wsltty (mintty and the wslbridge2 gateway).
+
+#### Starting issues ####
+
+If wsltty fails with an 
+`Error: Could not fork child process: Resource temporarily unavailable`...,
+its runtime may be affected by some over-ambitious virus defense strategy.
+For example, with Windows Defender, option “Force randomization for images” 
+should be disabled.
+
+If wsltty fails with an error message that mentions a disk mount path (e.g. `/mnt/c`),
+workarounds may be the shutdown of the WSL V2 virtual machine (`wsl --shutdown` on the distro) 
+or turning off “fast startup” in the Windows power settings (#246, #248).
 
 ---
 
@@ -152,10 +173,11 @@ Mintty can maintain its configuration file in various locations,
 with the following precedence:
 * file given with mintty option `-c` (not used by wsltty default installation)
 * file `config` in directory given with mintty option `--configdir`
-  * This is `%APPDATA%\wsltty\config` in the default wsltty installation.
+  * **`%APPDATA%\wsltty\config`** in the default wsltty installation
 * `%HOME%\.minttyrc` (usage deprecated with wsltty)
 * `%HOME%\.config\mintty\config` (usage deprecated with wsltty)
-* `%APPDATA%\mintty\config`
+* common config file for all mintty installation instances
+  * **`%APPDATA%\mintty\config`**
 * `%LOCALAPPDATA%\wsltty\etc\minttyrc` (usage deprecated with wsltty)
 
 Note:
@@ -175,11 +197,16 @@ Note:
 
 #### Shell selection and Login shell ####
 
-The WSLtty deployment does not impose a shell preference.
+The WSLtty deployment does not impose a shell preference;
+it invokes the user’s default shell in login mode by the final `-` parameter:
+* `%LOCALAPPDATA%\wsltty\bin\mintty.exe --WSL= --configdir="%APPDATA%\wsltty" -`
 
-To invoke your favourite shell or launch the shell in login mode, 
+You may tweak shortcuts, scripts, or context menu entries as follows:
-you may append a shell pathname and an optional `-l` parameter 
+
-to the mintty invocation (in shortcuts, scripts, or context menu entries):
+To launch a default shell in non-login mode, remove the final dash.
+
+To invoke your preferred shell, replace the final dash with 
+a shell pathname and an optional `-l` parameter 
 * `%LOCALAPPDATA%\wsltty\bin\mintty.exe --WSL= --configdir="%APPDATA%\wsltty" /bin/bash -l`
 
 ---

VERSION

@@ -1 +1 @@
-3.0.5
+3.2.0

cmd2.bat

@@ -0,0 +1 @@
+%1 "%from%" "%to%"

config-distros.sh

@@ -1,15 +1,42 @@
 #! /bin/sh
 
-# set some paths; capital variables are for the mkshortcut.exe case, 
+# dash built-in echo enforces interpretation of \t etc
-# not for the mkshortcut.vbs case
+echoc () {
+  #cmd /c echo $*
+  printf '%s\n' "$*"
+}
+
+copy () {
+  from="$1"
+  to="$2"
+  export from to
+  cmd /c cmd2.bat copy
+}
+
+delete () {
+  from=/F
+  to="$1"
+  export from to
+  cmd /c cmd2.bat del
+}
+
+compare () {
+  from="$1"
+  to="$2"
+  export from to
+  cmd /c cmd2.bat comp/M
+}
+
 
 case "$installdir" in
 ?*)	custominst=true;;
 "")	custominst=false;;
 esac
 
-INSTDIR=${installdir:-$LOCALAPPDATA/wsltty}
+INSTDIR="${installdir:-$LOCALAPPDATA/wsltty}"
+echoc "Installing wsltty into $INSTDIR"
 INSTDIR=`cd "$INSTDIR"; pwd`
+installcop=${installdir:-"$LOCALAPPDATA\\wsltty"}
 installdir=${installdir:-'%LOCALAPPDATA%\wsltty'}
 
 target="$installdir"'\bin\mintty.exe'
@@ -18,7 +45,7 @@ case "$INSTDIR" in
 *)	TARGETPATH="$INSTDIR"/bin/mintty.exe;;
 esac
 
-CONFDIR=${configdir:-$APPDATA/wsltty}
+CONFDIR="${configdir:-$APPDATA/wsltty}"
 configdir=${configdir:-'%APPDATA%\wsltty'}
 
 PATH=/bin:"$PATH":$SYSTEMROOT/System32
@@ -37,9 +64,14 @@ case "$1" in
 -info)
   config=false
   shift;;
+-shortcuts)
+  shift;;
 -shortcuts-remove)
   remove=true
   shift;;
+-default)
+  alldistros=false
+  shift;;
 -contextmenu)
   contextmenu=true
   shift;;
@@ -77,6 +109,26 @@ case "$1" in
   shift;;
 esac
 
+
+if $config && ! $contextmenu
+then
+  # remove shortcut entries in Start menu and cmd-line bat shortcuts
+  (cd "$INSTDIR"
+   for lnk in *.lnk
+   do
+     if compare "$lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\$lnk"
+     then delete "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\$lnk"
+     fi
+   done
+   for bat in *.bat
+   do
+     if compare "$bat" "$LOCALAPPDATA\\Microsoft\\WindowsApps\\$bat"
+     then delete "$LOCALAPPDATA\\Microsoft\\WindowsApps\\$bat"
+     fi
+   done
+  )
+fi
+
 # test w/o WSL: call this script with REGTOOLFAKE=true dash config-distros.sh
 if ${REGTOOLFAKE:-false}
 then
@@ -103,10 +155,6 @@ regtool () {
 }
 fi
 
-# dash built-in echo enforces interpretation of \t etc
-echoc () {
-  cmd /c echo $*
-}
 
 if $config
 then while read line; do echo "$line"; done <</EOB > mkbat.bat
@@ -140,10 +188,10 @@ then
   bridgeargs=-contextmenu-remove
   cscript /nologo mkshortcut.vbs "/name:remove from context menu" "/min:true"
 
-  cmd /C copy "add to context menu.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+  copy "add to context menu.lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
-  cmd /C copy "add default to context menu.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+  copy "add default to context menu.lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
-  cmd /C copy "remove from context menu.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+  copy "remove from context menu.lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
-  cmd /C copy "configure WSL shortcuts.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+  copy "configure WSL shortcuts.lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
 
   # restore target
   target="$installdir"'\bin\mintty.exe'
@@ -179,74 +227,76 @@ config () {
     case "$distro" in
     Legacy)
     	name="Bash on Windows"
-    	launch=
     	launcher="$SYSTEMROOT/System32/bash.exe"
     	;;
     *)	name="$distro"
-    	launch="$distro"
     	launcher="$LOCALAPPDATA/Microsoft/WindowsApps/$distro.exe"
     	;;
     esac
     basepath=`regtool get "$lxss/$guid/BasePath"`
     if package=`regtool -q get "$lxss/$guid/PackageFamilyName"`
     then
-    	instdir=`regtool get "$schema/$package/Schemas/PackageFullName"`
+    	distrinst=`regtool get "$schema/$package/Schemas/PackageFullName"`
     	# get actual executable path (may not match $distro) from app manifest
-    	manifest="$ProgramW6432/WindowsApps/$instdir/AppxManifest.xml"
+    	manifest="$ProgramW6432/WindowsApps/$distrinst/AppxManifest.xml"
     	psh_cmd='([xml]$(Get-Content '"\"$manifest\""')).Package.Applications.Application.Executable'
     	executable=`appex "$manifest"`
-    	if [ -r "$ProgramW6432/WindowsApps/$instdir/$executable" ]
+    	if [ -r "$ProgramW6432/WindowsApps/$distrinst/$executable" ]
-    	then	icon="%PROGRAMFILES%/WindowsApps/$instdir/$executable"
+    	then	icon="$ProgramW6432/WindowsApps/$distrinst/$executable"
-    	elif [ -r "$ProgramW6432/WindowsApps/$instdir/images/icon.ico" ]
+    	elif [ -r "$ProgramW6432/WindowsApps/$distrinst/images/icon.ico" ]
-    	then	icon="%PROGRAMFILES%/WindowsApps/$instdir/images/icon.ico"
+    	then	icon="$ProgramW6432/WindowsApps/$distrinst/images/icon.ico"
-    	else	icon="$installdir"'\wsl.ico'
+    	else	icon="$installcop"'\wsl.ico'
     	fi
     	root="$basepath/rootfs"
     elif [ -f "$basepath/$distro.exe" ]
     then
     	icon="$basepath/$distro.exe"
     	root="$basepath/rootfs"
-    else
+    elif [ -d "$LOCALAPPDATA/lxss" ]
-    	icon="%LOCALAPPDATA%/lxss/bash.ico"
+    then
+    	# legacy "Bash on Windows"
+    	icon="$LOCALAPPDATA/lxss/bash.ico"
     	root="$basepath"
+    else
+    	# imported distro? (#226, #236)
+    	icon="$installcop"'\wsl.ico'
+    	root="$basepath/rootfs"
     fi
 
-    #minttyargs='--wsl --rootfs="'"$root"'" --configdir="'"$configdir"'" -o Locale=C -o Charset=UTF-8 /bin/wslbridge '
+    # invocation parameters for mintty
     minttyargs='--WSL="'"$distro"'" --configdir="'"$configdir"'"'
+    # MINTARGS deprecated; used for mkshortcut.exe rather than mkshortcut.vbs
     MINTARGS='--WSL="'"$distro"'" --configdir="'"$CONFDIR"'"'
-    #if [ -z "$launch" ]
+    # invocation commands (deprecated for mintty, used for start menu scripts)
-    #then	bridgeargs='-t /bin/bash'
+    #bridgeargs='--distro-guid "'"$guid"'" -t'
-    #else	bridgeargs='-l "'"$launch"'" -t /bin/bash'
-    #fi
-    bridgeargs='--distro-guid "'"$guid"'" -t /bin/bash'
-    bridgeargs='--distro-guid "'"$guid"'" -t'
 
     ok=true;;
   DefaultDistribution|"")	# WSL default installation
     distro=
     name=WSL
-    icon="$installdir"'\wsl.ico'
+    icon="$installcop"'\wsl.ico'
     minttyargs='--WSL= --configdir="'"$configdir"'"'
     MINTARGS='--WSL= --configdir="'"$CONFDIR"'"'
-    bridgeargs='-t'
+    #bridgeargs='-t'
 
     ok=true;;
   esac
+  bridgeargs=" -"	# now used to request login mode
+
   echoc "distro '$distro'"
   echoc "- name '$name'"
   echoc "- guid $guid"
   echoc "- (launcher $launcher)"
   echoc "- icon $icon"
   echoc "- root $root"
-  bridgeargs=" "	# deprecated
   wdir=%USERPROFILE%
 
   if $ok && [ -n "$distro" ]
   then	# fix #163: backend missing +x with certain mount options
 	echo Setting +x wslbridge2 backends for distro "'$distro'"
-	(cd "$INSTDIR"; cd bin; wsl.exe -d "$distro" chmod +x wslbridge2-backend hvpty-backend)
+	(cd "$INSTDIR"; cd bin; PATH="${WINDIR}/Sysnative:${PATH}" wsl.exe -d "$distro" chmod +x wslbridge2-backend)
-#	(cd "$LOCALAPPDATA/wsltty/bin"; wsl.exe -d "$distro" chmod +x wslbridge2-backend hvpty-backend)
+#	(cd "$LOCALAPPDATA/wsltty/bin"; wsl.exe -d "$distro" chmod +x wslbridge2-backend)
-#	(cd ... ; "$SYSTEMROOT/System32/bash.exe" "$guid" -c chmod +x wslbridge2-backend hvpty-backend)
+#	(cd ... ; "$SYSTEMROOT/System32/bash.exe" "$guid" -c chmod +x wslbridge2-backend)
   fi
 
   if $ok && $config
@@ -256,46 +306,66 @@ config () {
     if $contextmenu
     then
       # context menu entries
-      #cmd /C mkcontext "$name"
       direckey='HKEY_CURRENT_USER\Software\Classes\Directory'
       keyname="${name}_Terminal"
       if $remove
       then
+        # obsolete; handled above
         reg delete "$direckey\\shell\\$keyname" /f
         reg delete "$direckey\\Background\\shell\\$keyname" /f
       else
-        reg add "$direckey\\shell\\$keyname" /d "$name Terminal" /f
+        direckey='/HKEY_CURRENT_USER/Software/Classes/Directory'
-        reg add "$direckey\\shell\\$keyname" /v Icon /d "$icon" /f
+        echoc Registry setting "$direckey/[Background/]shell/$keyname"
-        cmd /C reg add "$direckey\\shell\\$keyname\\command" /d "\"$target\" -i \"$icon\" --dir \"%1\" $minttyargs $bridgeargs" /f
+        target="$installcop"'\bin\mintty.exe'
-        reg add "$direckey\\Background\\shell\\$keyname" /d "$name Terminal" /f
+
-        reg add "$direckey\\Background\\shell\\$keyname" /v Icon /d "$icon" /f
+        regtool add "$direckey/shell"
-        cmd /C reg add "$direckey\\Background\\shell\\$keyname\\command" /d "\"$target\" -i \"$icon\" $minttyargs $bridgeargs" /f
+        regtool add "$direckey/shell/$keyname"
+        regtool set "$direckey/shell/$keyname/" -s "$name Terminal"
+        regtool set "$direckey/shell/$keyname/Icon" -s "$icon"
+        regtool add "$direckey/shell/$keyname/command"
+        regtool set "$direckey/shell/$keyname/command/" -s "\"$target\" -i \"$icon\" --dir \"%1\" $MINTARGS $bridgeargs"
+
+        regtool add "$direckey/Background/shell"
+        regtool add "$direckey/Background/shell/$keyname"
+        regtool set "$direckey/Background/shell/$keyname/" -s "$name Terminal"
+        regtool set "$direckey/Background/shell/$keyname/Icon" -s "$icon"
+        regtool add "$direckey/Background/shell/$keyname/command"
+        regtool set "$direckey/Background/shell/$keyname/command/" -s "\"$target\" -i \"$icon\" $MINTARGS $bridgeargs"
       fi
     else
       # invocation shortcuts and scripts
       if $remove
       then
-        cmd /C del "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\$name Terminal.lnk"
+        delete "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\$name Terminal.lnk"
-        cmd /C del "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name.bat"
+        delete "$LOCALAPPDATA\\Microsoft\\WindowsApps\\$name.bat"
-        cmd /C del "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name~.bat"
+        delete "$LOCALAPPDATA\\Microsoft\\WindowsApps\\$name~.bat"
 
         if [ "$name" = "WSL" ]
         then
               # determine actual Desktop folder
               desktopkey='\HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Desktop'
               desktop=`regtool get "$desktopkey"`
-              cmd /C del "$desktop\\$name Terminal.lnk"
+              case "$desktop" in
+              %USERPROFILE%*)	desktop="$USERPROFILE${desktop#%USERPROFILE%}";;
+              esac
+              delete "$desktop\\$name Terminal.lnk"
         fi
       else
         # desktop shortcut in %USERPROFILE% -> Start Menu - WSLtty
         cscript /nologo mkshortcut.vbs "/name:$name Terminal %"
         #mkshortcut.exe -n "$name Terminal %" -i "$icon" "$TARGETPATH" -a "$MINTARGS" -d "" -w %USERPROFILE%
-        cmd /C copy "$name Terminal %.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+        copy "$name Terminal %.lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
 
         # launch script in . -> WSLtty home, WindowsApps launch folder
         cmd /C mkbat.bat "$name"
-        cmd /C copy "$name.bat" "$installdir"
+        copy "$name.bat" "$LOCALAPPDATA\\Microsoft\\WindowsApps"
-        cmd /C copy "$name.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps"
+
+        # store backup copies in installation dir
+        if [ "$PWD" != "$INSTDIR" ]
+        then
+              copy "$name Terminal %.lnk" "$installcop"
+              copy "$name.bat" "$installcop"
+        fi
 
         # prepare versions to target WSL home directory
         #bridgeargs="-C~ $bridgeargs"
@@ -305,24 +375,33 @@ config () {
         # desktop shortcut in ~ -> Start Menu
         cscript /nologo mkshortcut.vbs "/name:$name Terminal"
         #mkshortcut.exe -n "$name Terminal" -i "$icon" "$TARGETPATH" -a "$MINTARGS" -d "" -w %USERPROFILE%
-        cmd /C copy "$name Terminal.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs"
+        copy "$name Terminal.lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs"
 
         # default desktop shortcut in ~ -> Desktop
         if [ "$name" = "WSL" ]
         then
-              #cmd /C copy "$name Terminal.lnk" "%USERPROFILE%\\Desktop"
+              #copy "$name Terminal.lnk" "$USERPROFILE\\Desktop"
-              #cmd /C copy "$name Terminal.lnk" "%APPDATA%\\..\\Desktop\\"
+              #copy "$name Terminal.lnk" "$APPDATA\\..\\Desktop\\"
               # the above does not work reliably (see #166)
               # determine actual Desktop folder
               desktopkey='\HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Desktop'
               desktop=`regtool get "$desktopkey"`
-              cmd /C copy "$name Terminal.lnk" "$desktop\\"
+              case "$desktop" in
+              %USERPROFILE%*)	desktop="$USERPROFILE${desktop#%USERPROFILE%}";;
+              esac
+              copy "$name Terminal.lnk" "$desktop\\"
         fi
 
         # launch script in ~ -> WSLtty home, WindowsApps launch folder
         cmd /C mkbat.bat "$name~"
-        cmd /C copy "$name~.bat" "$installdir"
+        copy "$name~.bat" "$LOCALAPPDATA\\Microsoft\\WindowsApps"
-        cmd /C copy "$name~.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps"
+
+        # store backup copies in installation dir
+        if [ "$PWD" != "$INSTDIR" ]
+        then
+              copy "$name Terminal.lnk" "$installcop"
+              copy "$name~.bat" "$installcop"
+        fi
       fi
 
     fi

dequote.bat

@@ -0,0 +1,3 @@
+@echo off
+rem https://ss64.com/nt/syntax-dequote.html
+for /f "delims=" %%A in ('echo %%%1%%') do set %1=%%~A

install.bat

@@ -1,19 +1,24 @@
 @echo off
 
 set refinstalldir=%%LOCALAPPDATA%%\wsltty
-set installdir=%LOCALAPPDATA%\wsltty
+set installdir="%LOCALAPPDATA%\wsltty"
 set refconfigdir=%%APPDATA%%\wsltty
-set configdir=%APPDATA%\wsltty
+set configdir="%APPDATA%\wsltty"
-set oldroot=%installdir%
+call dequote installdir
-set oldhomedir=%installdir%\home\%USERNAME%
+call dequote configdir
-set oldconfigdir=%oldhomedir%\.config\mintty
+set oldroot="%installdir%"
+set oldhomedir="%installdir%\home\%USERNAME%"
+call dequote oldroot
+call dequote oldhomedir
+set oldconfigdir="%oldhomedir%\.config\mintty"
+call dequote oldconfigdir
 if not "%1" == "" set refinstalldir=%1 && set installdir=%1
 if not "%2" == "" set refconfigdir=%2 && set configdir=%2
 
 
 :deploy
 
-mkdir "%installdir%"
+mkdir "%installdir%" 2> nul:
 
 rem clean up previous installation artefacts
 del /Q "%installdir%\*.bat"
@@ -31,6 +36,8 @@ rem copy "WSL Terminal %%.lnk" "%installdir%"
 copy config-distros.sh "%installdir%"
 
 copy mkshortcut.vbs "%installdir%"
+copy cmd2.bat "%installdir%"
+copy dequote.bat "%installdir%"
 
 rem allow persistent customization of default icon:
 if not exist "%installdir%\wsl.ico" copy tux.ico "%installdir%\wsl.ico"
@@ -39,25 +46,21 @@ copy uninstall.bat "%installdir%"
 
 if not exist "%installdir%\bin" goto instbin
 rem move previous programs possibly in use out of the way
-del /Q "%installdir%\bin\*.old"
+del /Q "%installdir%\bin\*.old" 2> nul:
 ren "%installdir%\bin\cygwin1.dll" cygwin1.dll.old
 ren "%installdir%\bin\cygwin-console-helper.exe" cygwin-console-helper.exe.old
 ren "%installdir%\bin\mintty.exe" mintty.exe.old
 ren "%installdir%\bin\wslbridge2.exe" wslbridge2.exe.old
 ren "%installdir%\bin\wslbridge2-backend" wslbridge2-backend.old
-ren "%installdir%\bin\hvpty.exe" hvpty.exe.old
+del /Q "%installdir%\bin\*.old" 2> nul:
-ren "%installdir%\bin\hvpty-backend" hvpty-backend.old
-del /Q "%installdir%\bin\*.old"
 
 :instbin
-mkdir "%installdir%\bin"
+mkdir "%installdir%\bin" 2> nul:
 copy cygwin1.dll "%installdir%\bin"
 copy cygwin-console-helper.exe "%installdir%\bin"
 copy mintty.exe "%installdir%\bin"
 copy wslbridge2.exe "%installdir%\bin"
 copy wslbridge2-backend "%installdir%\bin"
-copy hvpty.exe "%installdir%\bin"
-copy hvpty-backend "%installdir%\bin"
 
 copy dash.exe "%installdir%\bin"
 copy regtool.exe "%installdir%\bin"
@@ -69,22 +72,23 @@ rem copy cygiconv-2.dll "%installdir%"\bin
 rem copy cygintl-8.dll "%installdir%"\bin
 
 rem create system config directory and copy config archive
-mkdir "%installdir%\usr\share\mintty\lang"
+mkdir "%installdir%\usr\share\mintty\lang" 2> nul:
 copy lang.zoo "%installdir%\usr\share\mintty\lang"
-mkdir "%installdir%\usr\share\mintty\themes"
+mkdir "%installdir%\usr\share\mintty\themes" 2> nul:
 copy themes.zoo "%installdir%\usr\share\mintty\themes"
-mkdir "%installdir%\usr\share\mintty\sounds"
+mkdir "%installdir%\usr\share\mintty\sounds" 2> nul:
 copy sounds.zoo "%installdir%\usr\share\mintty\sounds"
-mkdir "%installdir%\usr\share\mintty\info"
+mkdir "%installdir%\usr\share\mintty\info" 2> nul:
 copy charnames.txt "%installdir%\usr\share\mintty\info"
-mkdir "%installdir%\usr\share\mintty\icon"
+mkdir "%installdir%\usr\share\mintty\icon" 2> nul:
 copy tux.ico "%installdir%\usr\share\mintty\icon"
 copy mintty.ico "%installdir%\usr\share\mintty\icon"
 
 
 rem create Start Menu Folder
-set smf=%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty
+set smf="%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty"
-mkdir "%smf%"
+call dequote smf
+mkdir "%smf%" 2> nul:
 
 rem clean up previous installation
 del /Q "%smf%\*.lnk"
@@ -97,7 +101,7 @@ copy "configure WSL shortcuts.lnk" "%smf%"
 rem copy "WSL Terminal.lnk" "%smf%"
 rem copy "WSL Terminal %%.lnk" "%smf%"
 rem clean up previous installation
-rmdir /S /Q "%smf%\context menu shortcuts"
+rmdir /S /Q "%smf%\context menu shortcuts" 2> nul:
 
 rem unpack config files in system config directory
 cd /D "%installdir%\usr\share\mintty\lang"
@@ -106,6 +110,7 @@ cd /D "%installdir%\usr\share\mintty\themes"
 "%installdir%\bin\zoo" xO themes
 cd /D "%installdir%\usr\share\mintty\sounds"
 "%installdir%\bin\zoo" xO sounds
+cd /D "%installdir%"
 
 
 :migrate configuration
@@ -120,24 +125,28 @@ rmdir "%oldhomedir%\.config"
 if exist "%configdir%\config" goto deloldhome
 if exist "%oldhomedir%\.minttyrc" copy "%oldhomedir%\.minttyrc" "%configdir%\config" && del "%oldhomedir%\.minttyrc"
 :deloldhome
-rmdir "%oldhomedir%"
+rmdir "%oldhomedir%" 2> nul:
-rmdir "%oldroot%\home"
+rmdir "%oldroot%\home" 2> nul:
 
 
 :userconfig
 
 rem create user config directory and subfolders
-mkdir "%configdir%\lang"
+mkdir "%configdir%\lang" 2> nul:
-mkdir "%configdir%\themes"
+mkdir "%configdir%\themes" 2> nul:
-mkdir "%configdir%\sounds"
+mkdir "%configdir%\sounds" 2> nul:
 
 rem create config file if it does not yet exist
 if not exist "%configdir%\config" echo # To use common configuration in %%APPDATA%%\mintty, simply remove this file>"%configdir%\config"
 
+
+:appconfig
+
 rem distro-specific stuff: shortcuts and launch scripts
-cd "%installdir%"
+cd /D "%installdir%"
-bin\dash.exe "%installdir%\config-distros.sh"
+echo Configuring for WSL distributions
-rem bin\dash.exe "%installdir%\config-distros.sh" -contextmenu
+bin\dash.exe "config-distros.sh"
+rem rem bin\dash.exe "config-distros.sh" -contextmenu
 
 
 :end

makefile

@@ -8,29 +8,40 @@
 
 
 # wsltty release
-ver=3.0.5
+ver=3.2.0
 
 # wsltty appx release - must have 4 parts!
-verx=3.0.5.0
+verx=3.2.0.0
 
+
+# mintty release version
+minttyver=3.2.0
+
+# wslbridge2 release version
+#repo=Biswa96/wslbridge2
+#wslbridgever=0.5
+
+repo=mintty/wslbridge2
+wslbridgever=0.5.1
+
+##############################
+
+# mintty branch or commit version
+#minttyver=master
+
+# wslbridge branch or commit to build from source;
+wslbridge=wslbridge-frontend wslbridge-backend
+
+##############################
+# build backend on a musl-libc-based distribution
+# (reportedly not needed anymore but untested)
+BuildDistr=-d Alpine
+
+##############################
 # Windows SDK version for appx
 WINSDKKEY=/HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/.NET Framework Platform/Setup/Multi-Targeting Pack
 WINSDKVER=`regtool list '$(WINSDKKEY)' | sed -e '$$ q' -e d`
 
-##############################
-# mintty release version
-minttyver=3.0.5
-
-# or mintty branch or commit version
-#minttyver=master
-
-##############################
-# wslbridge binary package; may be overridden below
-wslbridgever=0.3
-
-# or wslbridge branch or commit to build from source;
-wslbridge=wslbridge-frontend wslbridge-backend
-
 #############################################################################
 # default target
 
@@ -65,14 +76,20 @@ wgeto=curl -R -L --connect-timeout 55
 # - ensure the path name drag-and-drop adaptation works (-> Cygwin, not MSYS)
 # - 64 Bit (x86_64) for more stable invocation (avoid fork issues)
 
-check:
+arch:=$(shell uname -m)
+
+check:	# checkarch
+	echo Building for:
+	echo $(arch) | grep .
 	# checking suitable host environment; run `make pkg` to bypass
 	# check cygwin (vs msys) for proper drag-and-drop paths:
 	uname | grep CYGWIN
+
+checkarch:
 	# check 32 bit to ensure 32-Bit Windows support, just in case:
 	#uname -m | grep i686
 	# check 64 bit to provide 64-Bit stability support:
-	uname -m | grep x86_64
+	#uname -m | grep x86_64
 
 #############################################################################
 # patch version information for appx package configuration
@@ -87,13 +104,20 @@ fix-verx:
 	sed -i~ -e '/<Identity / s,Version="[.0-9]*",Version="$(verx)",' AppxManifest.xml
 	echo patched AppxManifest.xml
 
+#############################################################################
+# clear binaries
+
+clean:
+	rm -fr wslbridge2-$(wslbridgever)/bin
+	rm -fr bin
+
 #############################################################################
 # generation
 
 wslbridge:	$(wslbridge)
 
 wslbridge2-$(wslbridgever).zip:
-	$(wgeto) https://github.com/Biswa96/wslbridge2/archive/v$(wslbridgever).zip -o wslbridge2-$(wslbridgever).zip
+	$(wgeto) https://github.com/$(repo)/archive/v$(wslbridgever).zip -o wslbridge2-$(wslbridgever).zip
 
 wslbridge-source:	wslbridge2-$(wslbridgever).zip
 	unzip -ou wslbridge2-$(wslbridgever).zip
@@ -101,18 +125,24 @@ wslbridge-source:	wslbridge2-$(wslbridgever).zip
 
 wslbridge-frontend:	wslbridge-source
 	echo ------------- Compiling wslbridge2 frontend
-	cd wslbridge2-$(wslbridgever); make RELEASE=1
 	mkdir -p bin
+	# frontend build
+	cd wslbridge2-$(wslbridgever)/src; make -f Makefile.frontend RELEASE=1
+	# extract binaries
 	cp wslbridge2-$(wslbridgever)/bin/wslbridge2.exe bin/
-	cp wslbridge2-$(wslbridgever)/bin/hvpty.exe bin/
+
+windir=$(shell cd "${WINDIR}"; pwd)
 
 wslbridge-backend:	wslbridge-source
 	echo ------------- Compiling wslbridge2 backend
-	uname -m | grep x86_64
+	#uname -m | grep x86_64
-	cd wslbridge2-$(wslbridgever); cmd /C wsl -d Alpine make RELEASE=1 & (sleep 8; echo built backend)
 	mkdir -p bin
+	# provide dependencies for backend build
+	PATH="$(windir)/Sysnative:${PATH}" cmd /C wsl.exe -u root $(BuildDistr) $(shell env | grep http_proxy=) apk add make g++ linux-headers < /dev/null
+	# invoke backend build
+	cd wslbridge2-$(wslbridgever)/src; PATH="$(windir)/Sysnative:${PATH}" cmd /C wsl.exe $(BuildDistr) make -f Makefile.backend RELEASE=1 < /dev/null
+	# extract binaries
 	cp wslbridge2-$(wslbridgever)/bin/wslbridge2-backend bin/
-	cp wslbridge2-$(wslbridgever)/bin/hvpty-backend bin/
 
 mintty-get:
 	$(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip
@@ -186,8 +216,8 @@ appx-bin:
 
 cop:	ver
 	mkdir -p rel
-	rm -fr rel/wsltty-$(ver)-install.exe
+	rm -f rel/wsltty-$(ver)-install-$(arch).exe
-	sed -e "s,%version%,$(ver)," makewinx.cfg > rel/wsltty.SED
+	sed -e "s,%version%,$(ver)," -e "s,%arch%,$(arch)," makewinx.cfg > rel/wsltty.SED
 	cp bin/cygwin1.dll rel/
 	cp bin/cygwin-console-helper.exe rel/
 	cp bin/dash.exe rel/
@@ -200,8 +230,6 @@ cop:	ver
 	cp charnames.txt rel/
 	cp bin/wslbridge2.exe rel/
 	cp bin/wslbridge2-backend rel/
-	cp bin/hvpty.exe rel/
-	cp bin/hvpty-backend rel/
 	cp mkshortcut.vbs rel/
 	#cp bin/mkshortcut.exe rel/
 	#cp bin/cygpopt-0.dll rel/

makewinx.cfg

@@ -26,7 +26,7 @@ SourceFiles=SourceFiles
 InstallPrompt=Install Mintty terminal for WSL (Windows Subsystem for Linux)?
 DisplayLicense=
 FinishMessage=Mintty for WSL installed - for documentation and configuration see https://github.com/mintty/wsltty
-TargetName=wsltty-%version%-install.exe
+TargetName=wsltty-%version%-install-%arch%.exe
 FriendlyName=wsltty
 AppLaunched=cmd.exe /c install.bat
 PostInstallCmd=<None>
@@ -37,8 +37,8 @@ FILE1="cygwin-console-helper.exe"
 FILE2="mintty.exe"
 FILE3="wslbridge2.exe"
 FILE4="wslbridge2-backend"
-FILE5="hvpty.exe"
+FILE5="LICENSE.mintty"
-FILE6="hvpty-backend"
+FILE6="LICENSE.wslbridge2"
 FILE7="config-distros.sh"
 FILE8="configure WSL shortcuts.lnk"
 FILE9="charnames.txt"
@@ -58,8 +58,8 @@ FILE22="themes.zoo"
 FILE23="sounds.zoo"
 FILE24="mintty.ico"
 FILE25="mkshortcut.vbs"
-FILE26="LICENSE.mintty"
+FILE26="dequote.bat"
-FILE27="LICENSE.wslbridge2"
+FILE27="cmd2.bat"
 
 [SourceFiles]
 SourceFiles0=.

uninstall.bat

@@ -1,30 +1,32 @@
 @echo off
 
-if "%installdir%" == "" set installdir=%LOCALAPPDATA%\wsltty
+if "%installdir%" == "" set installdir="%LOCALAPPDATA%\wsltty"
+call dequote installdir
 
 
 :shortcuts
 
 rem delete Start Menu Folder
-set smf=%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty
+set smf="%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty"
+call dequote smf
 rmdir /S /Q "%smf%"
 
 
 :start menu
 
-cd %installdir%
+cd /D "%installdir%"
 bin\dash.exe config-distros.sh -shortcuts-remove
 
 
 :explorer context menu
 
-cd %installdir%
+cd /D "%installdir%"
 bin\dash.exe config-distros.sh -contextmenu-remove
 
 
 :undeploy
 
-cd %installdir%
+cd /D "%installdir%"
 rem currently not removing software
 
 

wslbridge-backend-static.patch

@@ -1,76 +0,0 @@
-diff -rup old/Makefile new/Makefile
---- old/Makefile	2018-05-06 01:12:36.000000000 +0200
-+++ new/Makefile	2019-07-24 22:29:12.874257700 +0200
-@@ -8,7 +8,9 @@ all : ../out/wslbridge-backend
- 		-static-libgcc -static-libstdc++ \
- 		-D_GNU_SOURCE \
- 		-DWSLBRIDGE_VERSION=$(shell cat ../VERSION.txt) \
--		-Wall -O2 $< ../common/SocketIo.cc -o $@ -lutil -pthread
-+		-Wall -O2 $< ../common/SocketIo.cc -o $@ \
-+		-ldl -lutil -static -pthread \
-+		-Wl,--whole-archive -lpthread -Wl,--no-whole-archive
- 	$(STRIP) $@
- 
- clean:
-diff -rup old/wslbridge-backend.cc new/wslbridge-backend.cc
---- old/wslbridge-backend.cc	2018-05-06 01:12:36.000000000 +0200
-+++ new/wslbridge-backend.cc	2019-07-24 22:55:25.324307400 +0200
-@@ -494,6 +494,58 @@ static void frontendVersionCheck(const c
- 
- } // namespace
- 
-+#define getpwuid _getpwuid
-+
-+#include <dlfcn.h>
-+typedef struct passwd * (*__getpwuid_t)(int uid);
-+
-+struct passwd * getpwuid(int uid)
-+{
-+    void * dl = dlopen(0, 0);
-+printf("dlopen %p\n", dl);
-+    if (dl) {
-+        struct passwd * (*__getpwuid)(int uid) =
-+            (__getpwuid_t)dlsym(dl, "getpwuid");
-+printf("dlsym %p\n", __getpwuid);
-+        if (__getpwuid)
-+            return __getpwuid(uid);
-+    }
-+
-+    FILE * pwd = fopen("/etc/passwd", "r");
-+    if (pwd) {
-+        char pwbuf[222];
-+        static struct passwd pw;
-+        pw.pw_shell = 0;
-+        while (fgets(pwbuf, sizeof pwbuf, pwd)) {
-+            char * sep = strchr(pwbuf, ':');
-+            if (!sep) continue;
-+            sep = strchr(++sep, ':');
-+            if (!sep) continue;
-+            int pwuid;
-+            if (sscanf(sep, ":%d:", &pwuid) == 1 && pwuid == uid) {
-+                // pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell
-+                //                  ^
-+                sep = strchr(++sep, ':');
-+                if (!sep) continue;
-+                sep = strchr(++sep, ':');
-+                if (!sep) continue;
-+                sep = strchr(++sep, ':');
-+                if (!sep) continue;
-+                sep = strchr(++sep, ':');
-+                if (!sep) continue;
-+                pw.pw_shell = ++sep;
-+                sep = strchr(++sep, '\n');
-+                if (sep)
-+                    *sep = 0;
-+                break;
-+            }
-+        }
-+        fclose(pwd);
-+        return &pw;
-+    }
-+    return 0;
-+}
-+
- int main(int argc, char *argv[]) {
- 
-     // If the backend crashes, it prints a message to its stderr, which is a