1.9.3

Add scoop install instructions to readme.md (#30)

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.
@@ -26,3 +26,8 @@ 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.
+

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

@@ -10,15 +10,16 @@ WSLtty components
 * a wsltty configuration directory in the user’s application folder `%APPDATA%`
   (“home”-located configuration files from a previously installed version 
   will be migrated to the new default location)
-* Start Menu shortcuts to start a WSL shell (with some variations, see below)
-* `*.bat` scripts to invoke WSL from the command line (see below)
-* optional context menu entries for Windows Explorer to start a WSL shell in the respective folder
+* Start Menu shortcuts to start WSL terminals
+* `*.bat` scripts to invoke WSL terminals from the command line
+* 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`
-* an uninstall script that can be invoked manually to remove shortcuts and context menu entries
 
-### 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.
@@ -41,6 +42,33 @@ 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
@@ -49,10 +77,28 @@ WSLtty can be invoked with
 * 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 some essential options.
+is discouraged because that would bypass essential options.
+
+---
 
 ### Configuration ###
 
+#### Start Menu and Desktop shortcuts ####
+
+In the Start Menu, the following shortcuts are installed:
+* For each installed WSL distribution D, D` Terminal` to start in the WSL user home
+* `WSL Terminal` to start the default WSL distribution (as configured with the Windows tool `wslconfig`)
+
+In the Start Menu subfolder WSLtty, the following shortcuts are installed:
+* For each installed WSL distribution D, D` Terminal %` to start in the Windows %USERPROFILE% home
+* `WSL Terminal %` to start the default WSL distribution in the Windows %USERPROFILE% home
+
+One Desktop shortcut is installed:
+* `WSL Terminal` to start the default WSL distribution (as configured with the Windows tool `wslconfig`)
+
+Other, distribution-specific shortcuts can be copied to the desktop 
+from the Start Menu if desired.
+
 #### Command line scripts `wsl*.bat` ####
 
 WSLtty installs the following scripts into `%LOCALAPPDATA%\Microsoft\WindowsApps` 
@@ -60,37 +106,19 @@ 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` to start the default WSL installation in the current folder/directory
-* `wsl~.bat` to start the default WSL installation in the WSL user home
-* `wsl-l.bat` to start the default WSL installation with a login shell
+* `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.
 
-#### Start Menu and Desktop shortcuts ####
-
-In the Start Menu, the following shortcuts are installed:
-* For each installed WSL distribution D, D` in Mintty` to start in the WSL user home
-
-In the Start Menu subfolder WSLtty, the following shortcuts are installed:
-* For each installed WSL distribution D, D` in Mintty` to start in the Windows %USERPROFILE% home
-* For each installed WSL distribution D, D` ~ in Mintty` to start in the WSL user home
-* `WSL % in Mintty` to start the default WSL installation in the Windows %USERPROFILE% home
-* `WSL ~ in Mintty` to start the default WSL installation in the WSL user home
-* `WSL -l in Mintty` to start the default WSL installation with a login shell
-
-WSLtty does not install Desktop shortcuts. If you want them, copy the 
-desired ones from the Start Menu subfolder `WSLtty`.
-
-To ensure a login shell to start in your Linux home directory, 
-add a `cd` command to your `$HOME/.profile` on Linux side.
-
 #### Context menu entries ####
 
-WSLtty provides context menu entries for all installed WSL distributions,
-to start a respective WSL shell in a specific folder from an Explorer window. 
+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 or remove context menu entries, run the respective script from the 
+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`.
 
 #### Mintty settings ####
@@ -120,13 +148,20 @@ 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 ####
 
-To invoke your favourite shell, replace `/bin/bash` with its pathname 
-in the Desktop or Start Menu shortcuts and `*.bat` launch scripts, 
-or Explorer context menu commands.
+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.
 
-### Components ###
+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 ###
 
 For mintty, see the [Mintty homepage](http://mintty.github.io/) 
 (with further screenshots), 
@@ -138,4 +173,4 @@ It is based on [Cygwin](http://cygwin.com)
 and includes its runtime library ([sources](http://mirrors.dotsrc.org/cygwin/x86/release/cygwin)).
 
 For interacting with WSL, it uses [wslbridge](https://github.com/rprichard/wslbridge).
-
+Many thanks for this enabling gateway go especially to Ryan Prichard.

VERSION

@@ -1 +1 @@
-0.7.9
+1.9.3

config-distros.sh

@@ -1,159 +1,231 @@
 #! /bin/sh
 
+installdir=${installdir:-'%LOCALAPPDATA%\wsltty'}
+configdir=${configdir:-'%APPDATA%\wsltty'}
+
+PATH=/bin:"$PATH"
+
 contextmenu=false
 remove=false
+alldistros=true
+config=true
+
+case "/$0" in
+*/wsl*)
+  config=false;;
+esac
+
 case "$1" in
--contextmenu)	contextmenu=true
-		shift;;
--contextmenu-remove)
-		contextmenu=true
-		remove=true
-		shift;;
+-info)
+  config=false
+  shift;;
 -shortcuts-remove)
-		remove=true
-		shift;;
+  remove=true
+  shift;;
+-contextmenu)
+  contextmenu=true
+  shift;;
+-contextmenu-default)
+  contextmenu=true
+  alldistros=false
+  shift;;
+-contextmenu-remove)
+  contextmenu=true
+  remove=true
+  direckey='/HKEY_CURRENT_USER/Software/Classes/Directory'
+
+  regtool list "$direckey/shell" 2>/dev/null |
+  while read name
+  do
+    case `regtool get "$direckey/shell/$name/command/"` in
+    *bin\\mintty.exe*/bin/wslbridge*|*bin\\mintty.exe*--WSL*)
+      regtool remove "$direckey/shell/$name/command"
+      regtool remove "$direckey/shell/$name"
+      ;;
+    esac
+  done
+
+  regtool list "$direckey/Background/shell" 2>/dev/null |
+  while read name
+  do
+    case `regtool get "$direckey/Background/shell/$name/command/"` in
+    *bin\\mintty.exe*/bin/wslbridge*|*bin\\mintty.exe*--WSL*)
+      regtool remove "$direckey/Background/shell/$name/command"
+      regtool remove "$direckey/Background/shell/$name"
+      ;;
+    esac
+  done
+  exit
+  shift;;
 esac
 
 # test w/o WSL: call this script with REGTOOLFAKE=true dash config-distros.sh
 if ${REGTOOLFAKE:-false}
 then
 regtool () {
-	case "$1" in
-	-*)	shift;;
-	esac
-	key=`echo $2 | sed -e 's,.*{\(.*\)}.*,\1,' -e t -e d`
-	case "$1.$2" in
-	list.*)				if $contextmenu
-					then	echo "{0}"
-					else	echo "{1}"; echo "{2}"
-					fi;;
-	get.*/DistributionName)		echo "distro$key";;
-	get.*/BasePath)			echo "C:\\Program\\{$key}\\State";;
-	get.*/PackageFamilyName)	echo "distro{$key}";;
-	get.*/PackageFullName)		echo "C:\\Program\\{$key}";;
-	esac
+  case "$1" in
+  -*)  shift;;
+  esac
+  key=`echo $2 | sed -e 's,.*{\(.*\)}.*,\1,' -e t -e d`
+  case "$1.$2" in
+  list.*)
+        if $contextmenu
+        then  echo "{0}"
+        else  echo "{1}"; echo "{2}"
+        fi;;
+  get.*/DistributionName)
+        echo "distro$key";;
+  get.*/BasePath)
+        echo "C:\\Program\\{$key}\\State";;
+  get.*/PackageFamilyName)
+        echo "distro{$key}";;
+  get.*/PackageFullName)
+        echo "C:\\Program\\{$key}";;
+  esac
 }
 fi
 
 # dash built-in echo enforces interpretation of \t etc
 echoc () {
-	cmd /c echo $*
+  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 %distro% in current directory>> %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 Created %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 "No WSL packages registered" >&2) |
+#(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
+  ok=false
   case $guid in
   {*)
-	distro=`regtool get "$lxss/$guid/DistributionName"`
-	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"`
-		if [ -r "$PROGRAMFILES/WindowsApps/$instdir/images/icon.ico" ]
-		then	icon="%PROGRAMFILES%/WindowsApps/$instdir/images/icon.ico"
-		else	icon="%LOCALAPPDATA%/wsltty/wsl.ico"
-		fi
-		root="$basepath/rootfs"
-	else	icon="%LOCALAPPDATA%/lxss/bash.ico"
-		root="$basepath"
-	fi
-	echoc "distro $distro"
-	echoc "- guid $guid"
-	echoc "- (launcher $launcher)"
-	echoc "- icon $icon"
-	echoc "- root $root"
+    distro=`regtool get "$lxss/$guid/DistributionName"`
+    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"`
+    	if [ -r "$ProgramW6432/WindowsApps/$instdir/images/icon.ico" ]
+    	then	icon="%PROGRAMFILES%/WindowsApps/$instdir/images/icon.ico"
+    	else	icon="$installdir"'\wsl.ico'
+    	fi
+    	root="$basepath/rootfs"
+    else
+    	icon="%LOCALAPPDATA%/lxss/bash.ico"
+    	root="$basepath"
+    fi
 
-	target='%LOCALAPPDATA%\wsltty\bin\mintty.exe'
-	minttyargs='--wsl --rootfs="'"$root"'" -h err --configdir="%APPDATA%\wsltty" -o Locale=C -o Charset=UTF-8 /bin/wslbridge '
-	#if [ -z "$launch" ]
-	#then	bridgeargs='-t /bin/bash'
-	#else	bridgeargs='-l "'"$launch"'" -t /bin/bash'
-	#fi
-	bridgeargs='--distro-guid "'"$guid"'" -t /bin/bash'
+    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'
+    #fi
+    bridgeargs='--distro-guid "'"$guid"'" -t /bin/bash'
+    bridgeargs='--distro-guid "'"$guid"'" -t'
 
-	export target minttyargs bridgeargs icon
-	export distro
+    ok=true;;
+  "")	# WSL default installation
+    distro=
+    name=WSL
+    icon="$installdir"'\wsl.ico'
+    minttyargs='--WSL= --configdir="'"$configdir"'"'
+    bridgeargs='-t'
+
+    ok=true;;
+  esac
+  echoc "distro '$distro'"
+  echoc "- name '$name'"
+  echoc "- guid $guid"
+  echoc "- (launcher $launcher)"
+  echoc "- icon $icon"
+  echoc "- root $root"
+  target="$installdir"'\bin\mintty.exe'
+  bridgeargs=" "
+
+  if $ok && $config
+  then
+    export target minttyargs bridgeargs icon
 
     if $contextmenu
     then
-      # create context menu entry
+      # context menu entries
       #cmd /C mkcontext "$name"
       direckey='HKEY_CURRENT_USER\Software\Classes\Directory'
       if $remove
       then
-	reg delete "$direckey\\shell\\$name" /f
-	reg delete "$direckey\\Background\\shell\\$name" /f
+        reg delete "$direckey\\shell\\$name" /f
+        reg delete "$direckey\\Background\\shell\\$name" /f
       else
-	reg add "$direckey\\shell\\$name" /d "$name in Mintty Here" /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 $brigdeargs" /f
-	reg add "$direckey\\Background\\shell\\$name" /d "$name in Mintty Here" /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 $brigdeargs" /f
+        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
       fi
     else
-
+      # invocation shortcuts and scripts
       if $remove
       then
-	cmd /C del "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\$name ~ in Mintty.lnk"
-	cmd /C del "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name.bat"
-	cmd /C del "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name~.bat"
+        cmd /C del "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\$name Terminal.lnk"
+        cmd /C del "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name.bat"
+        cmd /C del "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name~.bat"
       else
-	# create desktop/start menu shortcut
-	cscript /nologo mkshortcut.vbs "/name:$name in Mintty"
-	# copy to Start Menu WSLtty subfolder
-	rem cmd /C mkdir "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty\\WinUser"
-	cmd /C copy "$name in Mintty.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+        # desktop shortcut in %USERPROFILE% -> Start Menu - WSLtty
+        cscript /nologo mkshortcut.vbs "/name:$name Terminal %"
+        cmd /C copy "$name Terminal %.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
 
-	# create command-line launch script
-	cmd /C mkbat.bat "$name"
-	#cmd /C mkbat.bat "$name in Mintty"
-	# copy to WSLtty home and to WindowsApps launch folder
-	cmd /C copy "$name.bat" "%LOCALAPPDATA%\\wsltty\\$name.bat"
-	cmd /C copy "$name.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name.bat"
+        # launch script in . -> WSLtty home, WindowsApps launch folder
+        cmd /C mkbat.bat "$name"
+        cmd /C copy "$name.bat" "$installdir"
+        cmd /C copy "$name.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps"
 
-	# prepare versions to target WSL home directory
-	bridgeargs="-C~ $bridgeargs"
+        # prepare versions to target WSL home directory
+        #bridgeargs="-C~ $bridgeargs"
+        minttyargs="$minttyargs -~"
 
-	# create optional addition desktop shortcut
-	cscript /nologo mkshortcut.vbs "/name:$name ~ in Mintty"
-	# copy to Start Menu
-	cmd /C copy "$name ~ in Mintty.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs"
+        # desktop shortcut in ~ -> Start Menu
+        cscript /nologo mkshortcut.vbs "/name:$name Terminal"
+        cmd /C copy "$name Terminal.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs"
 
-	# create command-line launch script
-	cmd /C mkbat.bat "$name~"
-	#cmd /C mkbat.bat "$name~ in Mintty"
-	# copy to WSLtty home and to WindowsApps launch folder
-	cmd /C copy "$name~.bat" "%LOCALAPPDATA%\\wsltty\\$name~.bat"
-	cmd /C copy "$name~.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name~.bat"
+        # default desktop shortcut in ~ -> Desktop
+        if [ "$name" = "WSL" ]
+        then	cmd /C copy "$name Terminal.lnk" "%USERPROFILE%\\Desktop"
+        fi
+
+        # launch script in ~ -> WSLtty home, WindowsApps launch folder
+        cmd /C mkbat.bat "$name~"
+        cmd /C copy "$name~.bat" "$installdir"
+        cmd /C copy "$name~.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps"
       fi
 
-    fi;;
-  esac
+    fi
+  fi
 done

install.bat

@@ -14,101 +14,79 @@ if not "%2" == "" set refconfigdir=%2 && set configdir=%2
 :deploy
 
 mkdir "%installdir%"
+
+rem clean up previous installation artefacts
+del /Q "%installdir%\*.bat"
+del /Q "%installdir%\*.lnk"
+
 copy LICENSE.mintty "%installdir%"
 copy LICENSE.wslbridge "%installdir%"
 
-echo @echo off> setdirs.bat
-echo set refinstalldir=%refinstalldir%>> setdirs.bat
-echo set installdir=%installdir%>> setdirs.bat
-echo set refconfigdir=%refconfigdir%>> setdirs.bat
-echo set configdir=%configdir%>> setdirs.bat
-copy setdirs.bat + uninstall.bat "%installdir%\uninstall.bat"
-
-copy setdirs.bat + wsl.bat "%installdir%\wsl.bat"
-copy setdirs.bat + wsl.bat "%LOCALAPPDATA%\Microsoft\WindowsApps\wsl.bat"
-copy setdirs.bat + wsl~.bat "%installdir%\wsl~.bat"
-copy setdirs.bat + wsl~.bat "%LOCALAPPDATA%\Microsoft\WindowsApps\wsl~.bat"
-copy setdirs.bat + wsl-l.bat "%installdir%\wsl-l.bat"
-copy setdirs.bat + wsl-l.bat "%LOCALAPPDATA%\Microsoft\WindowsApps\wsl-l.bat"
-
 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 Terminal.lnk" "%installdir%"
+copy "WSL Terminal %%.lnk" "%installdir%"
 copy wsl.ico "%installdir%"
 copy config-distros.sh "%installdir%"
 copy mkshortcut.vbs "%installdir%"
-rem clean up previous installation
-del "%installdir%\config-context-menu.bat"
 
+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\info"
+copy charnames.txt "%installdir%\usr\share\mintty\info"
+mkdir "%installdir%\usr\share\mintty\icon"
+copy wsl.ico "%installdir%\usr\share\mintty\icon"
 
 
-:shortcuts
-
-rem generate shortcuts
-
-rem set icon=%%LOCALAPPDATA%%\lxss\bash.ico
-set lxicon=%%LOCALAPPDATA%%\lxss\bash.ico
-set icon=%%LOCALAPPDATA%%\wsltty\wsl.ico
-if exist "%installdir%\wsl.ico" goto iconok
-if exist "%lxicon" copy "%lxicon" "%installdir%\wsl.ico"
-:iconok
-
-set target=%refinstalldir%\bin\mintty.exe
-set minttyargs=--wsl -h err --configdir="%refconfigdir%" -o Locale=C -o Charset=UTF-8 /bin/wslbridge 
-set bridgeargs=-t /bin/bash
-cscript mkshortcut.vbs "/name:WSL %% in Mintty"
-set bridgeargs=-C~ -t /bin/bash
-cscript mkshortcut.vbs "/name:WSL ~ in Mintty"
-set bridgeargs=-t /bin/bash -l
-cscript mkshortcut.vbs "/name:WSL -l in Mintty"
-
 rem create Start Menu Folder
 set smf=%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty
 mkdir "%smf%"
+
+rem clean up previous installation
+del /Q "%smf%\*.lnk"
+
 copy "wsltty home & help.url" "%smf%"
 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%"
+copy "WSL Terminal.lnk" "%smf%"
+copy "WSL Terminal %%.lnk" "%smf%"
 rem clean up previous installation
 rmdir /S /Q "%smf%\context menu shortcuts"
 
-rem create launch shortcuts for default WSL distro
-copy "WSL %% in Mintty.lnk" "%installdir%"
-copy "WSL %% in Mintty.lnk" "%smf%"
-copy "WSL ~ in Mintty.lnk" "%installdir%"
-copy "WSL ~ in Mintty.lnk" "%smf%"
-copy "WSL -l in Mintty.lnk" "%installdir%"
-copy "WSL -l in Mintty.lnk" "%smf%"
-rem clean up previous installation
-del "%smf%\WSL Bash %% in Mintty.lnk"
-del "%smf%\WSL Bash ~ in Mintty.lnk"
-del "%smf%\WSL Bash -l in Mintty.lnk"
-
-goto sysconfig
-
-rem create Desktop Shorcuts
-copy "WSL %% in Mintty.lnk" "%USERPROFILE%\Desktop"
-copy "WSL ~ in Mintty.lnk" "%USERPROFILE%\Desktop"
-
-
-:sysconfig
-
 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
 
 
 :migrate configuration
@@ -140,7 +118,7 @@ if not exist "%configdir%\config" echo # To use common configuration in %%APPDAT
 rem distro-specific stuff: shortcuts and launch scripts
 cd "%installdir%"
 bin\dash.exe "%installdir%\config-distros.sh"
-bin\dash.exe "%installdir%\config-distros.sh" -contextmenu
+rem bin\dash.exe "%installdir%\config-distros.sh" -contextmenu
 
 
 :end

makefile

@@ -2,32 +2,59 @@
 # 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.7.9
+ver=1.9.3
 
+# wsltty appx release
+verx=0.9.3
+
+##############################
 # mintty release version
-minttyver=2.7.9
+minttyver=2.9.3
+
+# or mintty branch or commit version
 #minttyver=master
 
-# wslbridge backend version
-wslbridgever=0.2.3
+##############################
+# 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=
+# 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:
-wslbridge-frontend=wslbridge-frontend
-wslbridge-commit=cb22e3f6f989cefe5b6599d3c04422ded74db664
+
+# use --distro-guid option (merged into 0.2.4):
+#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
@@ -50,53 +77,90 @@ 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
 
 #############################################################################
 # 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
+	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
 	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
+	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
 
+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:
-	cd mintty-$(minttyver)/src; make LDFLAGS="-static -static-libgcc -s" VERSION_SUFFIX="– wsltty $(ver)"
+	# 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/
+
+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/
+
+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 ../../
+	# 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 info
+	cp mintty-$(minttyver)/lang/*.po usr/share/mintty/lang/
+	cp mintty-$(minttyver)/themes/*[!~] usr/share/mintty/themes/
+	# 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
@@ -106,6 +170,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
@@ -116,7 +185,9 @@ 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 charnames.txt rel/
 	cp bin/wslbridge.exe rel/
 	cp bin/wslbridge-backend rel/
 	cp LICENSE.* rel/
@@ -139,9 +210,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
+	sh ./build.sh
 
 #############################################################################
 # end

makewinx.cfg

@@ -39,26 +39,25 @@ FILE3="wslbridge.exe"
 FILE4="wslbridge-backend"
 FILE5="LICENSE.mintty"
 FILE6="LICENSE.wslbridge"
-FILE7="WSL % in Mintty.lnk"
-FILE8="WSL ~ in Mintty.lnk"
-FILE9="WSL -l in Mintty.lnk"
-FILE10="wsl.bat"
-FILE11="wsl~.bat"
-FILE12="wsl-l.bat"
+FILE7="config-distros.sh"
+FILE8="configure WSL shortcuts.lnk"
+FILE9="charnames.txt"
+FILE10="VERSION"
+FILE11="dash.exe"
+FILE12="regtool.exe"
 FILE13="install.bat"
 FILE14="uninstall.bat"
 FILE15="wsl.ico"
 FILE16="add to context menu.lnk"
-FILE17="remove from context menu.lnk"
-FILE18="wsltty home & help.url"
-FILE19="zoo.exe"
-FILE20="po.zoo"
-FILE21="dash.exe"
-FILE22="regtool.exe"
-FILE23="config-distros.sh"
-FILE24="configure WSL shortcuts.lnk"
+FILE17="add default to context menu.lnk"
+FILE18="remove from context menu.lnk"
+FILE19="wsltty home & help.url"
+FILE20="zoo.exe"
+FILE21="lang.zoo"
+FILE22="themes.zoo"
+FILE23="WSL Terminal %.lnk"
+FILE24="WSL Terminal.lnk"
 FILE25="mkshortcut.vbs"
-FILE26="VERSION"
 
 [SourceFiles]
 SourceFiles0=.
@@ -90,5 +89,4 @@ SourceFiles0=.
 %FILE23%=
 %FILE24%=
 %FILE25%=
-%FILE26%=
 

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"

wsl-l.bat

@@ -1,13 +0,0 @@
-@echo off
-
-rem Start mintty terminal for WSL with login shell
-
-if "%installdir%" == "" set installdir=%LOCALAPPDATA%\wsltty
-if "%configdir%" == "" set configdir=%APPDATA%\wsltty
-
-rem To enable invocation of this script from WIN+R or from cmd.exe,
-rem you may want to copy this script into "%SYSTEMROOT%\System32",
-rem or include the installation folder "%LOCALAPPDATA%\wsltty" in your PATH
-
-"%installdir%\bin\mintty.exe" --wsl -h err "--configdir=%configdir%" -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\wsltty\wsl.ico" /bin/wslbridge -t /bin/bash -l
-

wsl.bat

@@ -1,13 +0,0 @@
-@echo off
-
-rem Start mintty terminal for WSL in current directory
-
-if "%installdir%" == "" set installdir=%LOCALAPPDATA%\wsltty
-if "%configdir%" == "" set configdir=%APPDATA%\wsltty
-
-rem To enable invocation of this script from WIN+R or from cmd.exe,
-rem you may want to copy this script into "%SYSTEMROOT%\System32",
-rem or include the installation folder "%LOCALAPPDATA%\wsltty" in your PATH
-
-"%installdir%\bin\mintty.exe" --wsl -h err "--configdir=%configdir%" -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\wsltty\wsl.ico" /bin/wslbridge -t /bin/bash
-

wsl~.bat

@@ -1,13 +0,0 @@
-@echo off
-
-rem Start mintty terminal for WSL in WSL home directory
-
-if "%installdir%" == "" set installdir=%LOCALAPPDATA%\wsltty
-if "%configdir%" == "" set configdir=%APPDATA%\wsltty
-
-rem To enable invocation of this script from WIN+R or from cmd.exe,
-rem you may want to copy this script into "%SYSTEMROOT%\System32",
-rem or include the installation folder "%LOCALAPPDATA%\wsltty" in your PATH
-
-"%installdir%\bin\mintty.exe" --wsl -h err "--configdir=%configdir%" -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\wsltty\wsl.ico" /bin/wslbridge -C~ -t /bin/bash
-