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

LICENSE.wslbridge

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2016 Ryan Prichard
+Copyright (c) 2017 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

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

VERSION

@@ -1 +1 @@
-1.8.1
+1.8.2

config-distros.sh

@@ -1,9 +1,21 @@
 #! /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;;
@@ -75,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
 
@@ -83,6 +96,7 @@ 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
 
@@ -154,7 +168,7 @@ do
   target='%LOCALAPPDATA%\wsltty\bin\mintty.exe'
   bridgeargs=" "
 
-  if $ok
+  if $ok && $config
   then
     export target minttyargs bridgeargs icon
 

install.bat

@@ -30,19 +30,33 @@ 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
@@ -62,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.1
+ver=1.8.2
 
+##############################
 # mintty release version
-minttyver=2.8.1
+minttyver=2.8.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
+# or wslbridge branch or commit to build from source;
-# release 0.2.0 does not have cygwin_internal(CW_SYNC_WINENV) yet;
+# also set wslbridge-commit
-# therefore using "master" below
+wslbridge=wslbridge-frontend wslbridge-backend
-#wslbridge-frontend=wslbridge-frontend
+
-# release 0.2.1 is updated and complete, no separate frontend build needed:
+# release 0.2.0 does not have cygwin_internal(CW_SYNC_WINENV) yet:
-wslbridge-frontend=
+#wslbridge-commit=master
-# only used if wslbridge-frontend non-empty:
-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,30 @@ 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:
+wslbridge-source:	wslbridge-$(wslbridge-commit).zip
 	$(wgeto) https://github.com/rprichard/wslbridge/archive/$(wslbridge-commit).zip -o wslbridge-$(wslbridge-commit).zip
 	unzip -o wslbridge-$(wslbridge-commit).zip
+	tr -d '\015' < wslbridge-$(wslbridge-commit)/LICENSE.txt > LICENSE.wslbridge
+
+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 +117,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 +138,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

@@ -53,7 +53,8 @@ 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"
 
 [SourceFiles]
 SourceFiles0=.
@@ -81,4 +82,5 @@ SourceFiles0=.
 %FILE19%=
 %FILE20%=
 %FILE21%=
+%FILE22%=