1.8.3.2

LICENSE.mintty

@@ -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.
+

README.md

@@ -75,7 +75,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,7 +86,8 @@ 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 ####

VERSION

@@ -1 +1 @@
-1.8.0
+1.8.3.2

config-distros.sh

@@ -1,14 +1,31 @@
 #! /bin/sh
 
+PATH=/bin:$PATH
+
 contextmenu=false
 remove=false
+alldistros=true
+config=true
+
+case "`basename $0`" in
+wsl*)
+  config=false;;
+esac
+
 case "$1" in
+-info)
+  config=false
+  shift;;
 -shortcuts-remove)
   remove=true
   shift;;
 -contextmenu)
   contextmenu=true
   shift;;
+-contextmenu-default)
+  contextmenu=true
+  alldistros=false
+  shift;;
 -contextmenu-remove)
   contextmenu=true
   remove=true
@@ -18,7 +35,7 @@ case "$1" in
   while read name
   do
     case `regtool get "$direckey/shell/$name/command/"` in
-    *bin\\mintty.exe*/bin/wslbridge*)
+    *bin\\mintty.exe*/bin/wslbridge*|*bin\\mintty.exe*--WSL*)
       regtool remove "$direckey/shell/$name/command"
       regtool remove "$direckey/shell/$name"
       ;;
@@ -29,7 +46,7 @@ case "$1" in
   while read name
   do
     case `regtool get "$direckey/Background/shell/$name/command/"` in
-    *bin\\mintty.exe*/bin/wslbridge*)
+    *bin\\mintty.exe*/bin/wslbridge*|*bin\\mintty.exe*--WSL*)
       regtool remove "$direckey/Background/shell/$name/command"
       regtool remove "$direckey/Background/shell/$name"
       ;;
@@ -70,7 +87,8 @@ 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
 
@@ -78,13 +96,19 @@ 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
 /EOB
+fi
 
 PATH=/bin:$PATH
 
 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) |
+#(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
@@ -116,8 +140,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="%APPDATA%\wsltty" -o Locale=C -o Charset=UTF-8 /bin/wslbridge '
+    minttyargs='--WSL="'"$distro"'" --configdir="%APPDATA%\wsltty"'
     #if [ -z "$launch" ]
     #then	bridgeargs='-t /bin/bash'
     #else	bridgeargs='-l "'"$launch"'" -t /bin/bash'
@@ -130,7 +154,7 @@ do
     distro=
     name=WSL
     icon="%LOCALAPPDATA%/wsltty/wsl.ico"
-    minttyargs='--WSL= -h err --configdir="%APPDATA%\wsltty"'
+    minttyargs='--WSL= --configdir="%APPDATA%\wsltty"'
     bridgeargs='-t'
 
     ok=true;;
@@ -144,7 +168,7 @@ do
   target='%LOCALAPPDATA%\wsltty\bin\mintty.exe'
   bridgeargs=" "
 
-  if $ok
+  if $ok && $config
   then
     export target minttyargs bridgeargs icon
 

install.bat

@@ -23,25 +23,40 @@ copy LICENSE.mintty "%installdir%"
 copy LICENSE.wslbridge "%installdir%"
 
 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%"
 copy config-distros.sh "%installdir%"
 copy mkshortcut.vbs "%installdir%"
 
+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"
 
 
 rem create Start Menu Folder
@@ -53,6 +68,7 @@ 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%"
 rem clean up previous installation
@@ -60,7 +76,9 @@ 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
 
 
 :migrate configuration

makefile

@@ -6,31 +6,40 @@
 # make pkg	to build an installer, bypassing the system checks
 # make wsltty	to build an installer using the local copy of mintty
 
-all:	check pkg
 
 # wsltty release
-ver=1.8.0
+ver=1.8.3.2
 
+##############################
 # mintty release version
-minttyver=2.8.0
+minttyver=2.8.3
+
+# 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
+
+#############################################################################
+# default target
+
+all:	check pkg
+
 #############################################################################
 # target checking and some defs
 
@@ -69,23 +78,32 @@ check:
 #############################################################################
 # 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
+
+wslbridge-backend:	wslbridge-source
+	cd wslbridge-$(wslbridge-commit)/backend; wslbridge make
+	mkdir -p bin
+	cp wslbridge-$(wslbridge-commit)/out/wslbridge-backend bin/
 
 mintty:	mintty-get mintty-build
 
@@ -101,7 +119,8 @@ mintty-build:
 	mkdir -p bin
 	cp mintty-$(minttyver)/bin/mintty.exe bin/
 	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 ../../
 
 cygwin:
 	mkdir -p bin
@@ -121,7 +140,8 @@ 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 bin/wslbridge.exe rel/
 	cp bin/wslbridge-backend rel/
 	cp LICENSE.* rel/

makewinx.cfg

@@ -39,26 +39,22 @@ 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="mkshortcut.vbs"
+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"
-FILE25="mkshortcut.vbs"
-FILE26="VERSION"
+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"
 
 [SourceFiles]
 SourceFiles0=.
@@ -87,8 +83,4 @@ SourceFiles0=.
 %FILE20%=
 %FILE21%=
 %FILE22%=
-%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"