update mintty 2.7.1

simplify tweaking of installation dir

LICENSE.mintty

@@ -0,0 +1,28 @@
+mintty is copyright 2008-13 Andy Koppe, 2015-16 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.
+
+The bundling clause can be found in the accompanying file LICENSE.bundling.
+
+The GPL license text can be found in the accompanying file LICENSE.GPL, 
+at /usr/share/doc/common-licenses/GPL-3.0 on Cygwin installs, 
+or on the GNU website at http://www.gnu.org/licenses/gpl.html.
+
+Sources are available from the project page at http://mintty.github.io/.
+
+Based on PuTTY version 0.60 by Simon Tatham and contributors.
+Big thanks to everyone involved for their work on PuTTY.
+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.
+
+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 
+quoted in the source file.
+
+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.

LICENSE.wslbridge

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Ryan Prichard
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.

README.md

@@ -1,16 +1,55 @@
 Mintty as a terminal for Bash on Ubuntu on Windows / WSL.
 
-#### Overview ####
+### Overview ###
 
 Run the [installer](https://github.com/mintty/wsltty/releases) to install
-* wsltty package components (see below) in the user’s application directory (where WSL is also installed)
+* wsltty package components (see below) in the user’s application folder (where WSL is also installed)
 * an empty wsltty “home directory” to enable storage of a mintty config file
-* a Desktop Shortcut and a Start Menu Shortcut to start WSL with a login bash in the *Windows user profile* directory; to start in the Linux home directory instead, add a `cd` command to your Linux `$HOME/.profile` script
-* context menu entries for Windows Explorer to start WSL with a bash in the respective directory
-* a script `wsl.bat` to invoke wsltty manually; copy the script from `%LOCALAPPDATA%\wsltty` to `%SYSTEMROOT%\System32` if desired
+* Start Menu and Desktop shortcuts to start a WSL bash (with some variations, see below)
+* optional context menu entries for Windows Explorer to start a WSL bash in the respective folder
+* install/uninstall context menu items from Start Menu subfolder
+* `wsl*.bat` scripts to invoke wsltty manually (with some variations and invocation options, see below)
 * an uninstall script that can be invoked manually to remove shortcuts and context menu entries
 
-#### Components ####
+### Configuration ###
+
+#### Command line scripts wsl*.bat ####
+
+WSLtty installs the following scripts in its application folder `%LOCALAPPDATA%\wsltty`:
+* `wsl.bat` to start a WSL bash in the current folder/directory
+* `wsl~.bat` to start a WSL bash in the WSL user home
+* `wsl-l.bat` to start a WSL login bash
+
+To enable invocation of these scripts from WIN+R or from cmd.exe, 
+copy them from `%LOCALAPPDATA%\wsltty` into `%SYSTEMROOT%\System32`, 
+renaming them as desired.
+(The package does not do this to avoid trouble with missing admin privileges.)
+
+#### Start Menu and Desktop shortcuts ####
+
+The Start Menu subfolder WSLtty offers three shortcuts:
+* `WSL Bash % in Mintty` to start a WSL bash in the Windows %USERPROFILE% home
+* `WSL Bash ~ in Mintty` to start a WSL bash in the WSL user home
+* `WSL Bash -l in Mintty` to start a WSL login bash
+
+To ensure a login bash to start in your Linux home directory, 
+add a `cd` command to your `$HOME/.profile` on Linux side.
+
+#### Mintty settings ####
+
+Mintty can maintain its configuration file in various locations, 
+with the following precedence:
+* file given with mintty option `-c`
+* `%LOCALAPPDATA%\wsltty\home\%USERNAME%\.minttyrc`
+* `%LOCALAPPDATA%\wsltty\home\%USERNAME%\.config\mintty\config`
+* `%APPDATA%\mintty\config`
+* `%LOCALAPPDATA%\wsltty\etc\minttyrc`
+
+Note that the `%APPDATA%\mintty\config` option provides the possibility 
+to maintain common mintty settings for various installations (like 
+wsltty, Cygwin, MinGW/msys, Git for Windows, MinEd for Windows).
+
+### Components ###
 
 For mintty, see the [Mintty homepage](http://mintty.github.io/).
 

config-context-menu.bat

@@ -0,0 +1,59 @@
+@echo off
+
+rem See comments in install.bat about changing the installation directory.
+set installdir=%LOCALAPPDATA%\wsltty
+
+
+if "%1"=="/U" goto remove
+if "%1"=="/u" goto remove
+
+
+:add
+rem add to Explorer context menu
+
+set userdirname=HKEY_CURRENT_USER\Software\Classes\Directory\shell
+set userdirpane=HKEY_CURRENT_USER\Software\Classes\Directory\Background\shell
+
+rem WSL in Mintty
+set label=WSL in Mintty
+rem set here=in this directory
+set here=Here
+
+rem WSL icon
+set icon=%LOCALAPPDATA%\lxss\bash.ico
+
+rem WSL target shell
+set shell=/bin/bash
+
+rem Mintty invocation
+set cmd=%installdir%\bin\mintty.exe
+set cset=-o Locale=C -o Charset=UTF-8
+set opts=--wsl
+set arg=/bin/wslbridge -t %shell%
+set target0=\"%cmd%\" %opts% %cset% -i \"%icon%\" %arg%
+rem set target1=\"%cmd%\" %opts% %cset% -i \"%icon%\" /bin/dash -c \"cd '%%1'; exec %arg%\"
+set target1=\"%cmd%\" %opts% %cset% -i \"%icon%\" --dir \"%%1\" %arg%
+
+rem Registry entries
+reg add "%userdirname%\wsltty" /d "%label% %here%" /f
+reg add "%userdirname%\wsltty" /v Icon /d "%icon%" /f
+reg add "%userdirname%\wsltty\command" /d "%target1%" /f
+reg add "%userdirpane%\wsltty" /d "%label% %here%" /f
+reg add "%userdirpane%\wsltty" /v Icon /d "%icon%" /f
+reg add "%userdirpane%\wsltty\command" /d "%target0%" /f
+
+goto end
+
+
+:remove
+rem remove from Explorer context menu
+
+rem delete Explorer context menu
+set userdirname=HKEY_CURRENT_USER\Software\Classes\Directory\shell
+set userdirpane=HKEY_CURRENT_USER\Software\Classes\Directory\Background\shell
+
+reg delete "%userdirname%\wsltty" /f
+reg delete "%userdirpane%\wsltty" /f
+
+
+:end

install.bat

@@ -1,70 +1,61 @@
-rem @echo off
+@echo off
+
+rem If you change the installation directory,
+rem it also needs to be adapted in
+rem - the Shortcut links *.lnk
+rem - the cmd invocation scripts wsl*.bat
+
+set installdir=%LOCALAPPDATA%\wsltty
 
 
 :deploy
 
-mkdir "%LOCALAPPDATA%\wsltty"
-copy LICENSE.mintty "%LOCALAPPDATA%\wsltty"
-copy LICENSE.wslbridge "%LOCALAPPDATA%\wsltty"
-copy uninstall.bat "%LOCALAPPDATA%\wsltty"
+mkdir "%installdir%"
+copy LICENSE.mintty "%installdir%"
+copy LICENSE.wslbridge "%installdir%"
+copy uninstall.bat "%installdir%"
 
-copy wsl.bat "%LOCALAPPDATA%\wsltty"
+copy wsl.bat "%installdir%"
+copy wsl~.bat "%installdir%"
+copy wsl-l.bat "%installdir%"
+copy "config-context-menu.bat" "%installdir%"
+copy "add to context menu.lnk" "%installdir%"
+copy "remove from context menu.lnk" "%installdir%"
 rem does not work without admin rights:
 rem copy wsl.bat "%SYSTEMROOT%\System32"
+rem copy wsl~.bat "%SYSTEMROOT%\System32"
+rem copy wsl-l.bat "%SYSTEMROOT%\System32"
 
-mkdir "%LOCALAPPDATA%\wsltty\bin"
-copy cygwin1.dll "%LOCALAPPDATA%\wsltty\bin"
-copy cygwin-console-helper.exe "%LOCALAPPDATA%\wsltty\bin"
-copy dash.exe "%LOCALAPPDATA%\wsltty\bin"
-copy mintty.exe "%LOCALAPPDATA%\wsltty\bin"
-copy wslbridge.exe "%LOCALAPPDATA%\wsltty\bin"
-copy wslbridge-backend "%LOCALAPPDATA%\wsltty\bin"
+mkdir "%installdir%\bin"
+copy cygwin1.dll "%installdir%\bin"
+copy cygwin-console-helper.exe "%installdir%\bin"
+rem copy dash.exe "%installdir%\bin"
+copy mintty.exe "%installdir%\bin"
+copy wslbridge.exe "%installdir%\bin"
+copy wslbridge-backend "%installdir%\bin"
 
 rem create "home directory" to enable storage of config file
-mkdir "%LOCALAPPDATA%\wsltty\home
-mkdir "%LOCALAPPDATA%\wsltty\home\%USERNAME%"
+mkdir "%installdir%\home
+mkdir "%installdir%\home\%USERNAME%"
 
 
 :shortcuts
 
-rem create Desktop Shorcut
-copy "Bash on UoW in Mintty.lnk" "%USERPROFILE%\Desktop"
+rem create Start Menu Folder
+set smf=%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty
+mkdir "%smf%"
+echo on
+copy "wsltty home & help.url" "%smf%"
+copy "WSL Bash %% in Mintty.lnk" "%smf%"
+copy "WSL Bash ~ in Mintty.lnk" "%smf%"
+copy "WSL Bash -l in Mintty.lnk" "%smf%"
+mkdir "%smf%\context menu shortcuts"
+copy "add to context menu.lnk" "%smf%\context menu shortcuts"
+copy "remove from context menu.lnk" "%smf%\context menu shortcuts"
 
-rem create Start Menu Shortcut
-copy "Bash on UoW in Mintty.lnk" "%APPDATA%\Microsoft\Windows\Start Menu"
-
-
-:explorer
-
-rem Explorer context menu
-set userdirname=HKEY_CURRENT_USER\Software\Classes\Directory\shell
-set userdirpane=HKEY_CURRENT_USER\Software\Classes\Directory\Background\shell
-
-rem WSL in Mintty
-set label=WSL in Mintty
-rem set here=in this directory
-set here=Here
-
-rem WSL icon
-set icon=%LOCALAPPDATA%\lxss\bash.ico
-
-rem WSL target shell
-set shell=/bin/bash
-
-rem Mintty invocation
-set cmd=%LOCALAPPDATA%\wsltty\bin\mintty.exe
-set cset=-o Locale=C -o Charset=UTF-8
-set icon=%LOCALAPPDATA%\lxss\bash.ico
-set arg=/bin/wslbridge -t %shell%
-set target0=\"%cmd%\" %cset% -i \"%icon%\" %arg%
-set target1=\"%cmd%\" %cset% -i \"%icon%\" /bin/dash -c \"cd '%%1'; exec %arg%\"
-
-reg add "%userdirname%\wsltty" /d "%label% %here%" /f
-reg add "%userdirname%\wsltty" /v Icon /d "%icon%" /f
-reg add "%userdirname%\wsltty\command" /d "%target1%" /f
-reg add "%userdirpane%\wsltty" /d "%label% %here%" /f
-reg add "%userdirpane%\wsltty" /v Icon /d "%icon%" /f
-reg add "%userdirpane%\wsltty\command" /d "%target0%" /f
+rem create Desktop Shorcuts
+copy "WSL Bash %% in Mintty.lnk" "%USERPROFILE%\Desktop"
+copy "WSL Bash ~ in Mintty.lnk" "%USERPROFILE%\Desktop"
 
 
 :end

makefile

@@ -1,9 +1,25 @@
 #############################################################################
 # default: generate all
-all:	wslbridge mintty cygwin wsltty pkg
+all:	check pkg
 
-ver=0.6.0
-wslbridgever=0.1.0
+# wsltty release
+ver=0.7.1
+
+# mintty release version
+minver=2.7.1
+#minver=master
+
+# wslbridge backend version
+wslbridgever=0.2.1
+# 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=
+
+#############################################################################
+# target checking and some defs
 
 TARGET := $(shell $(CC) -dumpmachine)
 
@@ -19,50 +35,72 @@ else
   $(error Target '$(TARGET)' not supported)
 endif
 
-wget=curl -R -L -O --connect-timeout 55
+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)
+
+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:
+	uname -m | grep i686
 
 #############################################################################
 # generation
 
-wslbridge:
+wslbridge:	wslbridge-backend $(wslbridge-frontend)
+
+wslbridge-backend:
 	$(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/
 	cp wslbridge-$(wslbridgever)-$(sys)/LICENSE.txt LICENSE.wslbridge
 
-mintty:
-	$(wget) https://github.com/mintty/mintty/archive/master.zip
-	mv master.zip mintty-master.zip
-	unzip -o mintty-master.zip
-	cd mintty-master/src; make LDFLAGS="-static -static-libgcc -s"
+wslbridge-frontend:
+	$(wgeto) https://github.com/rprichard/wslbridge/archive/master.zip -o wslbridge-master.zip
+	unzip -o wslbridge-master.zip
+	cd wslbridge-master/frontend; make
+	strip wslbridge-master/out/wslbridge.exe
 	mkdir -p bin
-	cp mintty-master/bin/mintty.exe bin/
-	cp mintty-master/LICENSE LICENSE.mintty
+	cp wslbridge-master/out/wslbridge.exe bin/
+	cp wslbridge-master/LICENSE.txt LICENSE.wslbridge
+
+mintty:
+	$(wgeto) https://github.com/mintty/mintty/archive/$(minver).zip -o mintty-$(minver).zip
+	unzip -o mintty-$(minver).zip
+	cd mintty-$(minver)/src; make LDFLAGS="-static -static-libgcc -s"
+	mkdir -p bin
+	cp mintty-$(minver)/bin/mintty.exe bin/
+	cp mintty-$(minver)/LICENSE LICENSE.mintty
 
 cygwin:
 	mkdir -p bin
 	cp /bin/cygwin1.dll bin/
 	cp /bin/cygwin-console-helper.exe bin/
-	cp /bin/dash.exe bin/
+	#cp /bin/dash.exe bin/
 
 wsltty:
 
-pkg:
+pkg:	wslbridge mintty cygwin wsltty
 	mkdir -p rel
 	sed -e "s,%version%,$(ver)," makewinx.cfg > rel/wsltty.SED
 	cp bin/cygwin1.dll rel/
 	cp bin/cygwin-console-helper.exe rel/
-	cp bin/dash.exe rel/
+	#cp bin/dash.exe rel/
 	cp bin/mintty.exe rel/
 	cp bin/wslbridge.exe rel/
 	cp bin/wslbridge-backend rel/
-	cp LICENSE.mintty rel/
-	cp LICENSE.wslbridge rel/
-	cp "Bash on UoW in Mintty.lnk" rel/
-	cp wsl.bat rel/
-	cp install.bat rel/
-	cp uninstall.bat rel/
+	cp LICENSE.* rel/
+	cp *.lnk rel/
+	cp *.url rel/
+	cp *.bat rel/
 	cd rel; iexpress /n wsltty.SED
 
 #############################################################################

makewinx.cfg

@@ -34,16 +34,23 @@ AdminQuietInstCmd=
 UserQuietInstCmd=
 FILE0="cygwin1.dll"
 FILE1="cygwin-console-helper.exe"
-FILE2="dash.exe"
-FILE3="mintty.exe"
-FILE4="wslbridge.exe"
-FILE5="wslbridge-backend"
-FILE6="LICENSE.mintty"
-FILE7="LICENSE.wslbridge"
-FILE8="Bash on UoW in Mintty.lnk"
-FILE9="wsl.bat"
-FILE10="install.bat"
-FILE11="uninstall.bat"
+FILE2="mintty.exe"
+FILE3="wslbridge.exe"
+FILE4="wslbridge-backend"
+FILE5="LICENSE.mintty"
+FILE6="LICENSE.wslbridge"
+FILE7="WSL Bash % in Mintty.lnk"
+FILE8="WSL Bash ~ in Mintty.lnk"
+FILE9="WSL Bash -l in Mintty.lnk"
+FILE10="wsl.bat"
+FILE11="wsl~.bat"
+FILE12="wsl-l.bat"
+FILE13="install.bat"
+FILE14="uninstall.bat"
+FILE15="config-context-menu.bat"
+FILE16="add to context menu.lnk"
+FILE17="remove from context menu.lnk"
+FILE18="wsltty home & help.url"
 
 [SourceFiles]
 SourceFiles0=.
@@ -61,4 +68,11 @@ SourceFiles0=.
 %FILE9%=
 %FILE10%=
 %FILE11%=
+%FILE12%=
+%FILE13%=
+%FILE14%=
+%FILE15%=
+%FILE16%=
+%FILE17%=
+%FILE18%=
 

uninstall.bat

@@ -1,5 +1,25 @@
 @echo off
 
+rem See comments in install.bat about changing the installation directory.
+
+set installdir=%LOCALAPPDATA%\wsltty
+
+
+:shortcuts
+
+rem delete Start Menu Folder
+set smf=%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty
+rmdir /S /Q "%smf%"
+
+rem delete Desktop Shortcuts
+del "%USERPROFILE%\Desktop\WSL Bash % in Mintty.lnk"
+del "%USERPROFILE%\Desktop\WSL Bash ~ in Mintty.lnk"
+
+
+:explorer context menu
+
+call "%installdir%\config-context-menu.bat" /U
+
 
 :undeploy
 
@@ -7,21 +27,4 @@ rem currently not removing software
 rem in any case, at least the config file (home\...) should not be removed
 
 
-:shortcuts
-
-rem delete Desktop Shortcut and Start Menu Shortcut
-del "%USERPROFILE%\Desktop\Bash on UoW in Mintty.lnk"
-del "%APPDATA%\Microsoft\Windows\Start Menu\Bash on UoW in Mintty.lnk"
-
-
-:explorer
-
-rem delete Explorer context menu
-set userdirname=HKEY_CURRENT_USER\Software\Classes\Directory\shell
-set userdirpane=HKEY_CURRENT_USER\Software\Classes\Directory\Background\shell
-
-reg delete "%userdirname%\wsltty" /f
-reg delete "%userdirpane%\wsltty" /f
-
-
 :end

wsl-l.bat

@@ -0,0 +1,12 @@
+@echo off
+
+rem Start mintty terminal for WSL in home directory
+
+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 You may want a variant of this script without trailing "-l" 
+rem to start in the current directory from cmd.exe
+
+"%LOCALAPPDATA%\wsltty\bin\mintty.exe" --wsl -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\lxss\bash.ico" /bin/wslbridge -t /bin/bash -l
+

wsl.bat

@@ -1,4 +1,12 @@
 @echo off
 
-"%LOCALAPPDATA%\wsltty\bin\mintty.exe" -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\lxss\bash.ico" /bin/wslbridge -t /bin/bash -l
+rem Start mintty terminal for WSL in home directory
+
+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 You may want a variant of this script without trailing "-l" 
+rem to start in the current directory from cmd.exe
+
+"%LOCALAPPDATA%\wsltty\bin\mintty.exe" --wsl -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\lxss\bash.ico" /bin/wslbridge -t /bin/bash
 

wsltty home & help.url

@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=https://github.com/mintty/wsltty

wsl~.bat

@@ -0,0 +1,12 @@
+@echo off
+
+rem Start mintty terminal for WSL in home directory
+
+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 You may want a variant of this script without trailing "-l" 
+rem to start in the current directory from cmd.exe
+
+"%LOCALAPPDATA%\wsltty\bin\mintty.exe" --wsl -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\lxss\bash.ico" /bin/wslbridge -C~ -t /bin/bash
+