3.0.2

use icon from exe if determined from manifest

LICENSE.mintty

@@ -1,4 +1,4 @@
-mintty is copyright 2008-13 Andy Koppe, 2015-16 Thomas Wolff.
+mintty is copyright 2008-13 Andy Koppe, 2015-18 Thomas Wolff.
 
 Licensed under the terms of the GNU General Public License version 3 or later,
 amended with the bundling clause to clarify ambiguous interpretation.
@@ -17,6 +17,8 @@ See LICENSE.PuTTY for PuTTY's copyright notice, contributors, and license.
 The sources of PuTTY 0.60 can be downloaded from
 ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-0.60.
 
+The minibidi algorithm is under MIT license as quoted in the source file.
+
 Sixel code (sixel.c) is relicensed under GPL like mintty with the 
 permission of its author (kmiya@culti); Sixel colour conversion code 
 (sixel_hls.c) is licensed by its author Ross Combs under the license 
@@ -26,3 +28,12 @@ The program icon is the apps/utilities-terminal icon from KDE's Oxygen theme,
 retrieved from http://websvn.kde.org/trunk/KDE/kdebase/runtime/pics/oxygen. 
 Thanks to the KDE artists for their sleek design. The Oxygen icons are licensed
 under the terms of the LGPLv3; see LICENSE.Oxygen for details.
+
+The colour schemes / theme files bundled with mintty are included 
+under various licenses. The source and license or permission are 
+quoted in the respective theme files.
+
+Bell sounds files are included, mostly under the creative commons license 
+(https://creativecommons.org/publicdomain/zero/1.0/), see also the README 
+in the sounds subdirectory.
+

LICENSE.wslbridge

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2016 Ryan Prichard
+Copyright (c) 2017-2018 Google LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

README.md

@@ -15,9 +15,11 @@ WSLtty components
 * optional context menu entries for Windows Explorer to start WSL terminals in the respective folder
 * install/uninstall context menu items from Start Menu subfolder `WSLtty`
 
-### Installation ###
+---
 
-#### WSLtty installer ####
+### Installation from this repository ###
+
+#### WSLtty installer ([Download](https://github.com/mintty/wsltty/releases) standalone installation) ####
 
 Run the [installer](https://github.com/mintty/wsltty/releases) to install 
 the components listed above.
@@ -40,16 +42,52 @@ Within the installation process, provide parameters to the script `install.bat`.
 The optional first parameter designates the installation target,
 the optional second parameter designates the configuration directory.
 
+### Installation with other package management environments ###
+
+#### Chocolatey ####
+
+If you use the [Chocolatey package manager](https://chocolatey.org/), 
+invoke one of
+<img height=222 align=right src=https://github.com/mintty/wsltty.appx/raw/master/wsltty.appx.png>
+* `choco install wsltty`
+* `choco upgrade wsltty`
+
+#### Scoop ####
+
+If you use the [Scoop package manager](https://scoop.sh/), 
+* `scoop bucket add extras`
+
+then, invoke one of
+* `scoop install wsltty`
+* `scoop update wsltty`
+
+#### Windows Appx package ####
+
+A Windows Appx package and certificate is available in the [wsltty.appx](https://github.com/mintty/wsltty.appx/) repository.
+
+<br clear=all>
+
+---
+
 ### Invocation ###
 
 WSLtty can be invoked with
 * installed Start Menu shortcuts (or Desktop shortcuts if copied there)
-* *.bat scripts
+* *.bat scripts (optionally with WSL command as parameters)
 * Explorer context menu (if installed from the Start Menu `WSLtty` subfolder)
 
 Starting the mintty terminal directly from the WSLtty installation location 
 is discouraged because that would bypass essential options.
 
+#### WSL 2 ####
+
+Due to some incompatible changes by Microsoft, wslbridge cannot connect 
+in WSL 2 mode at this time.
+Workaround:
+* `wsl --set-default-version 1`
+
+---
+
 ### Configuration ###
 
 #### Start Menu and Desktop shortcuts ####
@@ -68,6 +106,12 @@ One Desktop shortcut is installed:
 Other, distribution-specific shortcuts can be copied to the desktop 
 from the Start Menu if desired.
 
+The Start menu folder WSLtty contains the link 
+<img align=absmiddle height=25 src=https://user-images.githubusercontent.com/12740416/57078483-a7846a00-6cee-11e9-9c5e-8c2e9e56cae4.png>`configure WSL shortcuts`.
+This function is initially run when wsltty is installed.
+If should be rerun after adding or removing WSL distributions, 
+in order to create the respective set of shortcuts in the Start menu.
+
 #### Command line scripts `wsl*.bat` ####
 
 WSLtty installs the following scripts into `%LOCALAPPDATA%\Microsoft\WindowsApps` 
@@ -75,7 +119,7 @@ WSLtty installs the following scripts into `%LOCALAPPDATA%\Microsoft\WindowsApps
 
 * For each installed WSL distribution D, D`.bat` to start in the current folder/directory
 * For each installed WSL distribution D, D`~.bat` to start in the WSL user home
-* `WSL.bat` and `WSL ~.bat` to start the default WSL distribution
+* `WSL.bat` and `WSL~.bat` to start the default WSL distribution
 
 Given that `%LOCALAPPDATA%\Microsoft\WindowsApps` is in your PATH,
 the scripts can be invoked from cmd.exe, PowerShell, or via WIN+R.
@@ -86,9 +130,23 @@ WSLtty provides context menu entries for all installed WSL distributions
 and one for the configured default distribution,
 to start a respective WSL terminal in a specific folder from an Explorer window.
 They are not installed by default.
+
 To add launch entries for the default or all WSL distributions to the 
 Explorer context menu, or remove them, run the respective script from the 
-Start Menu subfolder `WSLtty`.
+Start Menu subfolder `WSLtty`:
+* <img align=absmiddle height=25 src=https://user-images.githubusercontent.com/12740416/57078483-a7846a00-6cee-11e9-9c5e-8c2e9e56cae4.png>`add default to context menu`
+  adds context menu entries for the default WSL distribution
+* <img align=absmiddle height=25 src=https://user-images.githubusercontent.com/12740416/57078483-a7846a00-6cee-11e9-9c5e-8c2e9e56cae4.png>`add to context menu`
+  adds context menu entries for all WSL distributions
+* <img align=absmiddle height=25 src=https://user-images.githubusercontent.com/12740416/57078483-a7846a00-6cee-11e9-9c5e-8c2e9e56cae4.png>`remove from context menu`
+  removes context menu entries for WSL distributions
+
+#### Icon ####
+
+Wsltty installation and the mintty terminal try to use the icon of the 
+respective WSL distribution. If it cannot be determined, a penguin icon 
+is used as a default. You can replace it with your preferred fallback icon 
+by replacing the icon file `%LOCALAPPDATA%\wsltty\wsl.ico`.
 
 #### Mintty settings ####
 
@@ -117,13 +175,18 @@ Note:
   If you define `HOME` at Windows level, this changes accordingly.
   Note, however, that the WSL `HOME` is a completely different setting.
 
-#### Shell selection ####
+#### Shell selection and Login shell ####
 
 The WSLtty deployment does not impose a shell preference anymore.
 However, the intermediate gateways (`wslbridge` and its backend and the `bash.exe` Windows launcher) 
-are also involved. To invoke your favourite shell, you may append 
-a shell pathname to the mintty invocation (in shortcuts, scripts, or context menu entries), 
-or handle shell replacement within the WSL startup scripts (esp. `.profile`).
+are also involved.
+
+To invoke your favourite shell or launch the shell in login mode, 
+you may append a shell pathname and an optional `-l` parameter 
+to the mintty invocation (in shortcuts, scripts, or context menu entries):
+* `%LOCALAPPDATA%\wsltty\bin\mintty.exe --WSL= --configdir="%APPDATA%\wsltty" /bin/bash -l`
+
+---
 
 ### Components and Credits ###
 

VERSION

@@ -1 +1 @@
-1.8.1
+3.0.2

config-distros.sh

@@ -1,9 +1,24 @@
 #! /bin/sh
 
+installdir=${installdir:-'%LOCALAPPDATA%\wsltty'}
+configdir=${configdir:-'%APPDATA%\wsltty'}
+
+PATH=/bin:"$PATH":$SYSTEMROOT/System32
+
 contextmenu=false
 remove=false
 alldistros=true
+config=true
+
+case "/$0" in
+*/wsl*)
+  config=false;;
+esac
+
 case "$1" in
+-info)
+  config=false
+  shift;;
 -shortcuts-remove)
   remove=true
   shift;;
@@ -75,28 +90,40 @@ echoc () {
   cmd /c echo $*
 }
 
-while read line; do echo "$line"; done <</EOB > mkbat.bat
+if $config
+then while read line; do echo "$line"; done <</EOB > mkbat.bat
 @echo off
 echo Creating %1.bat
 
 echo @echo off> %1.bat
 echo rem Start mintty terminal for WSL package %name% in current directory>> %1.bat
-echo %target% -i "%icon%" %minttyargs% %bridgeargs%>> %1.bat
+echo %target% -i "%icon%" %minttyargs% %bridgeargs% %%*>> %1.bat
 /EOB
-
-PATH=/bin:$PATH
+fi
 
 lxss="/HKEY_CURRENT_USER/Software/Microsoft/Windows/CurrentVersion/Lxss"
 schema="/HKEY_CURRENT_USER/Software/Classes/Local Settings/Software/Microsoft/Windows/CurrentVersion/AppModel/SystemAppData"
 
-#(regtool list "$lxss" 2>/dev/null && echo || echo "No WSL packages registered" >&2) |
-(
-  if $alldistros
-  then  regtool list "$lxss" 2>/dev/null
-  else  true
-  fi && echo || echo "No WSL packages registered" >&2) |
-while read guid
-do
+appex () {
+  while read line
+  do
+	case "$line" in
+	*Application*Executable*)
+		for item in $line
+		do	case "$item" in
+			Executable=*)
+				eval $item
+				echo "$Executable"
+				break;;
+			esac
+		done
+		break;;
+	esac
+  done < $*
+}
+
+config () {
+  guid="$1"
   ok=false
   case $guid in
   {*)
@@ -116,9 +143,15 @@ do
     if package=`regtool -q get "$lxss/$guid/PackageFamilyName"`
     then
     	instdir=`regtool get "$schema/$package/Schemas/PackageFullName"`
-    	if [ -r "$ProgramW6432/WindowsApps/$instdir/images/icon.ico" ]
+    	# get actual executable path (may not match $distro) from app manifest
+    	manifest="$ProgramW6432/WindowsApps/$instdir/AppxManifest.xml"
+    	psh_cmd='([xml]$(Get-Content '"\"$manifest\""')).Package.Applications.Application.Executable'
+    	executable=`appex "$manifest"`
+    	if [ -r "$ProgramW6432/WindowsApps/$instdir/$executable" ]
+    	then	icon="%PROGRAMFILES%/WindowsApps/$instdir/$executable"
+    	elif [ -r "$ProgramW6432/WindowsApps/$instdir/images/icon.ico" ]
     	then	icon="%PROGRAMFILES%/WindowsApps/$instdir/images/icon.ico"
-    	else	icon="%LOCALAPPDATA%/wsltty/wsl.ico"
+    	else	icon="$installdir"'\wsl.ico'
     	fi
     	root="$basepath/rootfs"
     else
@@ -126,8 +159,8 @@ do
     	root="$basepath"
     fi
 
-    minttyargs='--wsl --rootfs="'"$root"'" -h err --configdir="%APPDATA%\wsltty" -o Locale=C -o Charset=UTF-8 /bin/wslbridge '
-    minttyargs='--WSL="'"$distro"'" -h err --configdir="%APPDATA%\wsltty"'
+    minttyargs='--wsl --rootfs="'"$root"'" --configdir="'"$configdir"'" -o Locale=C -o Charset=UTF-8 /bin/wslbridge '
+    minttyargs='--WSL="'"$distro"'" --configdir="'"$configdir"'"'
     #if [ -z "$launch" ]
     #then	bridgeargs='-t /bin/bash'
     #else	bridgeargs='-l "'"$launch"'" -t /bin/bash'
@@ -136,11 +169,11 @@ do
     bridgeargs='--distro-guid "'"$guid"'" -t'
 
     ok=true;;
-  "")	# WSL default installation
+  DefaultDistribution|"")	# WSL default installation
     distro=
     name=WSL
-    icon="%LOCALAPPDATA%/wsltty/wsl.ico"
-    minttyargs='--WSL= -h err --configdir="%APPDATA%\wsltty"'
+    icon="$installdir"'\wsl.ico'
+    minttyargs='--WSL= --configdir="'"$configdir"'"'
     bridgeargs='-t'
 
     ok=true;;
@@ -151,29 +184,37 @@ do
   echoc "- (launcher $launcher)"
   echoc "- icon $icon"
   echoc "- root $root"
-  target='%LOCALAPPDATA%\wsltty\bin\mintty.exe'
-  bridgeargs=" "
+  target="$installdir"'\bin\mintty.exe'
+  bridgeargs=" "	# deprecated
 
-  if $ok
+  if $ok && [ -n "$distro" ]
+  then	# fix #163: backend missing +x with certain mount options
+	echo Setting +x wslbridge-backend for distro "'$distro'"
+	(cd "$LOCALAPPDATA/wsltty/bin"; wsl.exe -d "$distro" chmod +x wslbridge-backend)
+#	(cd "$LOCALAPPDATA/wsltty/bin"; "$SYSTEMROOT/System32/bash.exe" "$guid" -c chmod +x wslbridge-backend)
+  fi
+
+  if $ok && $config
   then
-    export target minttyargs bridgeargs icon
+    export name target minttyargs bridgeargs icon
 
     if $contextmenu
     then
       # context menu entries
       #cmd /C mkcontext "$name"
       direckey='HKEY_CURRENT_USER\Software\Classes\Directory'
+      keyname="${name}_Terminal"
       if $remove
       then
-        reg delete "$direckey\\shell\\$name" /f
-        reg delete "$direckey\\Background\\shell\\$name" /f
+        reg delete "$direckey\\shell\\$keyname" /f
+        reg delete "$direckey\\Background\\shell\\$keyname" /f
       else
-        reg add "$direckey\\shell\\$name" /d "$name Terminal" /f
-        reg add "$direckey\\shell\\$name" /v Icon /d "$icon" /f
-        cmd /C reg add "$direckey\\shell\\$name\\command" /d "\"$target\" -i \"$icon\" --dir \"%1\" $minttyargs $bridgeargs" /f
-        reg add "$direckey\\Background\\shell\\$name" /d "$name Terminal" /f
-        reg add "$direckey\\Background\\shell\\$name" /v Icon /d "$icon" /f
-        cmd /C reg add "$direckey\\Background\\shell\\$name\\command" /d "\"$target\" -i \"$icon\" $minttyargs $bridgeargs" /f
+        reg add "$direckey\\shell\\$keyname" /d "$name Terminal" /f
+        reg add "$direckey\\shell\\$keyname" /v Icon /d "$icon" /f
+        cmd /C reg add "$direckey\\shell\\$keyname\\command" /d "\"$target\" -i \"$icon\" --dir \"%1\" $minttyargs $bridgeargs" /f
+        reg add "$direckey\\Background\\shell\\$keyname" /d "$name Terminal" /f
+        reg add "$direckey\\Background\\shell\\$keyname" /v Icon /d "$icon" /f
+        cmd /C reg add "$direckey\\Background\\shell\\$keyname\\command" /d "\"$target\" -i \"$icon\" $minttyargs $bridgeargs" /f
       fi
     else
       # invocation shortcuts and scripts
@@ -189,8 +230,8 @@ do
 
         # launch script in . -> WSLtty home, WindowsApps launch folder
         cmd /C mkbat.bat "$name"
-        cmd /C copy "$name.bat" "%LOCALAPPDATA%\\wsltty\\$name.bat"
-        cmd /C copy "$name.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name.bat"
+        cmd /C copy "$name.bat" "$installdir"
+        cmd /C copy "$name.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps"
 
         # prepare versions to target WSL home directory
         #bridgeargs="-C~ $bridgeargs"
@@ -202,15 +243,36 @@ do
 
         # default desktop shortcut in ~ -> Desktop
         if [ "$name" = "WSL" ]
-        then	cmd /C copy "$name Terminal.lnk" "%USERPROFILE%\\Desktop"
+        then
+              #cmd /C copy "$name Terminal.lnk" "%USERPROFILE%\\Desktop"
+              #cmd /C 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\\"
         fi
 
         # launch script in ~ -> WSLtty home, WindowsApps launch folder
         cmd /C mkbat.bat "$name~"
-        cmd /C copy "$name~.bat" "%LOCALAPPDATA%\\wsltty\\$name~.bat"
-        cmd /C copy "$name~.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name~.bat"
+        cmd /C copy "$name~.bat" "$installdir"
+        cmd /C copy "$name~.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps"
       fi
 
     fi
   fi
+}
+
+# ensure proper parameter passing to cmd /C
+chcp.com 65001 # just in case; seems to work without as well
+
+# configure for all distros, plus default distro
+for guid in `
+  if $alldistros
+  then  regtool list "$lxss" 2>/dev/null
+  else  echo DefaultDistribution
+  fi || echo "No WSL packages registered" >&2
+`
+do	config $guid
 done
+

install.bat

@@ -26,23 +26,47 @@ copy "add to context menu.lnk" "%installdir%"
 copy "add default to context menu.lnk" "%installdir%"
 copy "remove from context menu.lnk" "%installdir%"
 copy "configure WSL shortcuts.lnk" "%installdir%"
-copy wsl.ico "%installdir%"
+rem copy "WSL Terminal.lnk" "%installdir%"
+rem copy "WSL Terminal %%.lnk" "%installdir%"
 copy config-distros.sh "%installdir%"
 copy mkshortcut.vbs "%installdir%"
+rem allow persistent customization of default icon:
+if not exist "%installdir%\wsl.ico" copy tux.ico "%installdir%\wsl.ico"
 
+if not exist "%installdir%\bin" goto instbin
+rem move previous programs possibly in use out of the way
+del /Q "%installdir%\bin\*.old"
+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\wslbridge.exe" wslbridge.exe.old
+ren "%installdir%\bin\wslbridge-backend" wslbridge-backend.old
+del /Q "%installdir%\bin\*.old"
+
+:instbin
 mkdir "%installdir%\bin"
 copy cygwin1.dll "%installdir%\bin"
 copy cygwin-console-helper.exe "%installdir%\bin"
-copy dash.exe "%installdir%\bin"
-copy regtool.exe "%installdir%\bin"
 copy mintty.exe "%installdir%\bin"
-copy zoo.exe "%installdir%\bin"
 copy wslbridge.exe "%installdir%\bin"
 copy wslbridge-backend "%installdir%\bin"
 
+copy dash.exe "%installdir%\bin"
+copy regtool.exe "%installdir%\bin"
+copy zoo.exe "%installdir%\bin"
+
 rem create system config directory and copy config archive
 mkdir "%installdir%\usr\share\mintty\lang"
-copy po.zoo "%installdir%\usr\share\mintty\lang"
+copy lang.zoo "%installdir%\usr\share\mintty\lang"
+mkdir "%installdir%\usr\share\mintty\themes"
+copy themes.zoo "%installdir%\usr\share\mintty\themes"
+mkdir "%installdir%\usr\share\mintty\sounds"
+copy sounds.zoo "%installdir%\usr\share\mintty\sounds"
+mkdir "%installdir%\usr\share\mintty\info"
+copy charnames.txt "%installdir%\usr\share\mintty\info"
+mkdir "%installdir%\usr\share\mintty\icon"
+copy tux.ico "%installdir%\usr\share\mintty\icon"
+copy mintty.ico "%installdir%\usr\share\mintty\icon"
 
 
 rem create Start Menu Folder
@@ -57,12 +81,18 @@ copy "add to context menu.lnk" "%smf%"
 copy "add default to context menu.lnk" "%smf%"
 copy "remove from context menu.lnk" "%smf%"
 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"
 
 rem unpack config files in system config directory
 cd /D "%installdir%\usr\share\mintty\lang"
-"%installdir%\bin\zoo" xO po
+"%installdir%\bin\zoo" xO lang
+cd /D "%installdir%\usr\share\mintty\themes"
+"%installdir%\bin\zoo" xO themes
+cd /D "%installdir%\usr\share\mintty\sounds"
+"%installdir%\bin\zoo" xO sounds
 
 
 :migrate configuration
@@ -85,8 +115,8 @@ rmdir "%oldroot%\home"
 
 rem create user config directory and subfolders
 mkdir "%configdir%\lang"
-mkdir "%configdir%\sounds"
 mkdir "%configdir%\themes"
+mkdir "%configdir%\sounds"
 
 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"

makefile

@@ -2,35 +2,64 @@
 # build a wsltty installer package:
 # configure ver=... and minttyver= in this makefile
 # make targets:
-# make [all]	to build a distributable installer (default)
-# make pkg	to build an installer, bypassing the system checks
-# make wsltty	to build an installer using the local copy of mintty
+# make [all]	build a distributable installer (default)
+# make pkg	build an installer, bypassing the system checks
+# make wsltty	build the software, using the local copy of mintty
 
-all:	check pkg
 
 # wsltty release
-ver=1.8.1
+ver=3.0.2
 
+# wsltty appx release - must have 4 parts!
+verx=3.0.2.2
+
+# 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=2.8.1
+minttyver=3.0.2
+
+# or mintty branch or commit version
 #minttyver=master
 
-# wslbridge backend version
+##############################
+# wslbridge binary package; may be overridden below
+wslbridge=wslbridge-package
 wslbridgever=0.2.4
 
-# wslbridge frontend version
-# release 0.2.0 does not have cygwin_internal(CW_SYNC_WINENV) yet;
-# therefore using "master" below
-#wslbridge-frontend=wslbridge-frontend
-# release 0.2.1 is updated and complete, no separate frontend build needed:
-wslbridge-frontend=
-# only used if wslbridge-frontend non-empty:
-wslbridge-commit=master
+# or wslbridge branch or commit to build from source;
+# also set wslbridge-commit
+wslbridge=wslbridge-frontend wslbridge-backend
+
+# release 0.2.0 does not have cygwin_internal(CW_SYNC_WINENV) yet:
+#wslbridge-commit=master
 
 # use --distro-guid option (merged into 0.2.4):
-#wslbridge-frontend=wslbridge-frontend
 #wslbridge-commit=cb22e3f6f989cefe5b6599d3c04422ded74db664
 
+# after 0.2.4, from branch login-mode:
+wslbridge-commit=04a060505860915c99bc336dbeb80269771a80b7
+
+# after 0.2.4, from branch wslpath:
+wslbridge-commit=29df86d87135caec8424c08f031ce121a3a39ae1
+
+# after 0.2.4, merged wslpath branch:
+wslbridge-commit=06fb7acba28d7f37611f3911685af214739895a0
+
+# after 0.2.4, with --backend option:
+wslbridge-commit=47b41bec6c32da58ab01de9345087b1a4fd836e3
+
+#############################################################################
+# default target
+
+all:	all-$(notdir $(CURDIR))
+
+all-wsltty:	check pkg
+
+all-wsltty.appx:	appx
+
 #############################################################################
 # target checking and some defs
 
@@ -52,56 +81,117 @@ wget=curl -R -L --connect-timeout 55 -O
 wgeto=curl -R -L --connect-timeout 55
 
 #############################################################################
-# system check;
-# for now, let's enforce Cygwin 32-Bit as the container for wsltty
-# just in case there is a 32-Bit WSL released (-> 32 bit), and to ensure 
-# the path name drag-and-drop adaptation works (-> cygwin, not msys)
+# system check:
+# - ensure the path name drag-and-drop adaptation works (-> Cygwin, not MSYS)
+# - 64 Bit (x86_64) for more stable invocation (avoid fork issues)
 
 check:
 	# checking suitable host environment; run `make pkg` to bypass
 	# check cygwin (vs msys) for proper drag-and-drop paths:
 	uname | grep CYGWIN
-	# check 32 bit (vs 64 bit) to ensure 32-Bit Windows support, just in case:
+	# check 32 bit to ensure 32-Bit Windows support, just in case:
 	#uname -m | grep i686
-	# check 64 bit (vs 32 bit) to provide 64-Bit stability support:
+	# check 64 bit to provide 64-Bit stability support:
 	uname -m | grep x86_64
 
+#############################################################################
+# patch version information for appx package configuration
+
+fix-verx:
+	echo patching $(WINSDKVER) into Launcher config
+	cd Launcher; sed -i~ -e "/<supportedRuntime / s,Version=v[.0-9]*,Version=$(WINSDKVER)," app.config
+	echo patched app.config
+	cd Launcher; sed -i~ -e "/<TargetFrameworkVersion>/ s,v[.0-9]*,$(WINSDKVER)," Launcher.csproj
+	echo patched Launcher.csproj
+	echo patching $(verx) into app config
+	sed -i~ -e '/<Identity / s,Version="[.0-9]*",Version="$(verx)",' AppxManifest.xml
+	echo patched AppxManifest.xml
+
 #############################################################################
 # generation
 
-wslbridge:	wslbridge-backend $(wslbridge-frontend)
+wslbridge:	$(wslbridge)
 
-wslbridge-backend:
+wslbridge-package:
 	$(wget) https://github.com/rprichard/wslbridge/releases/download/$(wslbridgever)/wslbridge-$(wslbridgever)-$(sys).tar.gz
 	tar xvzf wslbridge-$(wslbridgever)-$(sys).tar.gz
 	mkdir -p bin
 	cp wslbridge-$(wslbridgever)-$(sys)/wslbridge* bin/
 	tr -d '\015' < wslbridge-$(wslbridgever)-$(sys)/LICENSE.txt > LICENSE.wslbridge
 
-wslbridge-frontend:
-	$(wgeto) https://github.com/rprichard/wslbridge/archive/$(wslbridge-commit).zip -o wslbridge-$(wslbridge-commit).zip
+wslbridge-source:	wslbridge-$(wslbridge-commit).zip
 	unzip -o wslbridge-$(wslbridge-commit).zip
+	#cd wslbridge-$(wslbridge-commit)/backend; patch -T -p1 < ../../wslbridge-backend-static.patch
+	tr -d '\015' < wslbridge-$(wslbridge-commit)/LICENSE.txt > LICENSE.wslbridge
+
+wslbridge-$(wslbridge-commit).zip:
+	$(wgeto) https://github.com/rprichard/wslbridge/archive/$(wslbridge-commit).zip -o wslbridge-$(wslbridge-commit).zip
+
+wslbridge-frontend:	wslbridge-source
+	echo ------------- Compiling wslbridge frontend
 	cd wslbridge-$(wslbridge-commit)/frontend; make
 	strip wslbridge-$(wslbridge-commit)/out/wslbridge.exe
 	mkdir -p bin
 	cp wslbridge-$(wslbridge-commit)/out/wslbridge.exe bin/
-	tr -d '\015' < wslbridge-$(wslbridge-commit)/LICENSE.txt > LICENSE.wslbridge
 
-mintty:	mintty-get mintty-build
+#wslbridge-backend:	wslbridge-source
+# tweak dependency to support build testing on non-Windows 10:
+backend-bin=wslbridge-$(wslbridge-commit)/out/wslbridge-backend
+backend-src=wslbridge-$(wslbridge-commit)/backend/wslbridge-backend.cc
+wslbridge-backend:	$(backend-bin) wslbridge-source
+$(backend-bin):	$(backend-src)
+	echo ------------- Compiling wslbridge backend
+	cd wslbridge-$(wslbridge-commit)/backend; if uname -m | grep x86_64; then cmd /C wsl make; else wslbridge make; fi
+	mkdir -p bin
+	cp wslbridge-$(wslbridge-commit)/out/wslbridge-backend bin/
 
 mintty-get:
 	$(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip
 	unzip -o mintty-$(minttyver).zip
+	cp mintty-$(minttyver)/icon/terminal.ico mintty.ico
 
 wslbuild=LDFLAGS="-static -static-libgcc -s"
+appxbuild=$(wslbuild) CCOPT=-DWSLTTY_APPX
 wslversion=VERSION_SUFFIX="– wsltty $(ver)" WSLTTY_VERSION="$(ver)"
+appxversion=VERSION_SUFFIX="– wsltty appx $(verx)" WSLTTY_VERSION="$(verx)"
 
 mintty-build:
+	# ensure rebuild of version-specific check and message
+	rm -f mintty-$(minttyver)/bin/*/windialog.o
+	# build mintty
 	cd mintty-$(minttyver)/src; make $(wslbuild) $(wslversion)
 	mkdir -p bin
 	cp mintty-$(minttyver)/bin/mintty.exe bin/
+	strip bin/mintty.exe
+
+mintty-build-appx:
+	# ensure rebuild of version-specific check and message
+	rm -f mintty-$(minttyver)/bin/*/windialog.o
+	# build mintty
+	cd mintty-$(minttyver)/src; make $(appxbuild) $(appxversion)
+	mkdir -p bin
+	cp mintty-$(minttyver)/bin/mintty.exe bin/
+	strip bin/mintty.exe
+
+mintty-pkg:
 	cp mintty-$(minttyver)/LICENSE LICENSE.mintty
-	cd mintty-$(minttyver)/lang; zoo a po *.po; mv po.zoo ../../
+	cd mintty-$(minttyver)/lang; zoo a lang *.po; mv lang.zoo ../../
+	cd mintty-$(minttyver)/themes; zoo a themes *[!~]; mv themes.zoo ../../
+	cd mintty-$(minttyver)/sounds; zoo a sounds *.wav *.WAV *.md; mv sounds.zoo ../../
+	# add charnames.txt to support "Character Info"
+	cd mintty-$(minttyver)/src; sh ./mknames
+	cp mintty-$(minttyver)/src/charnames.txt .
+
+mintty-appx:
+	mkdir -p usr/share/mintty
+	cd usr/share/mintty; mkdir -p lang themes sounds info
+	cp mintty-$(minttyver)/lang/*.po usr/share/mintty/lang/
+	cp mintty-$(minttyver)/themes/*[!~] usr/share/mintty/themes/
+	cp mintty-$(minttyver)/sounds/*.wav usr/share/mintty/sounds/
+	cp mintty-$(minttyver)/sounds/*.WAV usr/share/mintty/sounds/
+	# add charnames.txt to support "Character Info"
+	cd mintty-$(minttyver)/src; sh ./mknames
+	cp mintty-$(minttyver)/src/charnames.txt usr/share/mintty/info/
 
 cygwin:
 	mkdir -p bin
@@ -111,6 +201,11 @@ cygwin:
 	cp /bin/regtool.exe bin/
 	cp /bin/zoo.exe bin/
 
+appx-bin:
+	mkdir -p bin
+	cp /bin/cygwin1.dll bin/
+	cp /bin/cygwin-console-helper.exe bin/
+
 cop:	ver
 	mkdir -p rel
 	rm -fr rel/wsltty-$(ver)-install.exe
@@ -121,7 +216,10 @@ cop:	ver
 	cp bin/regtool.exe rel/
 	cp bin/mintty.exe rel/
 	cp bin/zoo.exe rel/
-	cp po.zoo rel/
+	cp lang.zoo rel/
+	cp themes.zoo rel/
+	cp sounds.zoo rel/
+	cp charnames.txt rel/
 	cp bin/wslbridge.exe rel/
 	cp bin/wslbridge-backend rel/
 	cp LICENSE.* rel/
@@ -144,9 +242,22 @@ installbat:
 ver:
 	echo $(ver) > VERSION
 
-pkg:	wslbridge cygwin mintty cab
+mintty:	mintty-get mintty-build
 
-wsltty:	wslbridge cygwin mintty-build cab
+mintty-usr:	mintty-get mintty-appx
+
+# local wsltty build target:
+wsltty:	wslbridge cygwin mintty-build mintty-pkg
+
+# standalone wsltty package build target:
+pkg:	wslbridge cygwin mintty-get mintty-build mintty-pkg cab
+
+# appx package contents target:
+wsltty-appx:	wslbridge appx-bin mintty-get mintty-build-appx mintty-appx
+
+# appx package target:
+appx:	wsltty-appx fix-verx
+	sh ./build.sh
 
 #############################################################################
 # end

makewinx.cfg

@@ -25,7 +25,7 @@ SourceFiles=SourceFiles
 [Strings]
 InstallPrompt=Install Mintty terminal for WSL (Windows Subsystem for Linux)?
 DisplayLicense=
-FinishMessage=Mintty for WSL installed - for documentation see https://github.com/mintty/wsltty
+FinishMessage=Mintty for WSL installed - for documentation and configuration see https://github.com/mintty/wsltty
 TargetName=wsltty-%version%-install.exe
 FriendlyName=wsltty
 AppLaunched=cmd.exe /c install.bat
@@ -41,19 +41,23 @@ FILE5="LICENSE.mintty"
 FILE6="LICENSE.wslbridge"
 FILE7="config-distros.sh"
 FILE8="configure WSL shortcuts.lnk"
-FILE9="mkshortcut.vbs"
+FILE9="charnames.txt"
 FILE10="VERSION"
 FILE11="dash.exe"
 FILE12="regtool.exe"
 FILE13="install.bat"
 FILE14="uninstall.bat"
-FILE15="wsl.ico"
+FILE15="tux.ico"
 FILE16="add to context menu.lnk"
 FILE17="add default to context menu.lnk"
 FILE18="remove from context menu.lnk"
 FILE19="wsltty home & help.url"
 FILE20="zoo.exe"
-FILE21="po.zoo"
+FILE21="lang.zoo"
+FILE22="themes.zoo"
+FILE23="sounds.zoo"
+FILE24="mkshortcut.vbs"
+FILE25="mintty.ico"
 
 [SourceFiles]
 SourceFiles0=.
@@ -81,4 +85,8 @@ SourceFiles0=.
 %FILE19%=
 %FILE20%=
 %FILE21%=
+%FILE22%=
+%FILE23%=
+%FILE24%=
+%FILE25%=
 

mkshortcut.vbs

@@ -1,15 +1,15 @@
 rem cscript mkshortcut.vbs [/param:arg] /target:link
 
-rem %
-rem /arguments:--wsl -h err -o Locale=C -o Charset=UTF-8 /bin/wslbridge -t /bin/bash
-rem ~
-rem /arguments:--wsl -h err -o Locale=C -o Charset=UTF-8 /bin/wslbridge -C~ -t /bin/bash
-rem -l
-rem /arguments:--wsl -h err -o Locale=C -o Charset=UTF-8 /bin/wslbridge -t /bin/bash -l
 rem /target:%LOCALAPPDATA%\wsltty\bin\mintty.exe
 rem /workingdir:%USERPROFILE%
-rem rem /icon:%LOCALAPPDATA%\lxss\bash.ico
 rem /icon:%LOCALAPPDATA%\wsltty\wsl.ico
+rem deprecated: /icon:%LOCALAPPDATA%\lxss\bash.ico
+rem deprecated: %
+rem /arguments:--wsl -o Locale=C -o Charset=UTF-8 /bin/wslbridge -t /bin/bash
+rem deprecated: ~
+rem /arguments:--wsl -o Locale=C -o Charset=UTF-8 /bin/wslbridge -C~ -t /bin/bash
+rem deprecated: -l
+rem /arguments:--wsl -o Locale=C -o Charset=UTF-8 /bin/wslbridge -t /bin/bash -l
 
 rem General - Name:
 name = Wscript.Arguments.Named("name") & ".lnk"
@@ -24,7 +24,7 @@ rem lnk.Arguments = Wscript.Arguments.Named("arguments")
 lnk.TargetPath = wshell.ExpandEnvironmentStrings("%target%")
 minttyargs = wshell.ExpandEnvironmentStrings("%minttyargs%")
 bridgeargs = wshell.ExpandEnvironmentStrings("%bridgeargs%")
-lnk.Arguments = minttyargs & bridgeargs
+lnk.Arguments = minttyargs & " " & bridgeargs
 rem wscript.echo "minttyargs: " & minttyargs
 rem wscript.echo lnk.Arguments
 

wslbridge-backend-static.patch

@@ -0,0 +1,61 @@
+diff -rup orig/Makefile new/Makefile
+--- orig/Makefile	2018-05-06 01:12:36.000000000 +0200
++++ new/Makefile	2019-05-01 08:16:53.647051200 +0200
+@@ -5,7 +5,7 @@ all : ../out/wslbridge-backend
+ ../out/wslbridge-backend : wslbridge-backend.cc ../common/SocketIo.cc ../common/SocketIo.h ../VERSION.txt Makefile
+ 	mkdir -p ../out
+ 	$(CXX) -std=c++11 -fno-exceptions \
+-		-static-libgcc -static-libstdc++ \
++		-static -static-libgcc -static-libstdc++ \
+ 		-D_GNU_SOURCE \
+ 		-DWSLBRIDGE_VERSION=$(shell cat ../VERSION.txt) \
+ 		-Wall -O2 $< ../common/SocketIo.cc -o $@ -lutil -pthread
+diff -rup orig/wslbridge-backend.cc new/wslbridge-backend.cc
+--- orig/wslbridge-backend.cc	2018-05-06 01:12:36.000000000 +0200
++++ new/wslbridge-backend.cc	2019-05-01 08:19:12.799688500 +0200
+@@ -494,6 +494,45 @@ static void frontendVersionCheck(const c
+ 
+ } // namespace
+ 
++#define getpwuid _getpwuid
++
++struct passwd * getpwuid(int 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