From 98d4697bca64bcd98e396fca929d22b09965fed3 Mon Sep 17 00:00:00 2001
From: Thomas Wolff <mintty@users.noreply.github.com>
Date: Tue, 11 Oct 2016 18:04:15 +0200
Subject: [PATCH] Add Shortcut and command script variants changing to Linux
 home directory (#3).

---
 Bash ~ on UoW in Mintty.lnk | Bin 0 -> 1903 bytes
 install.bat                 |  11 ++++++++---
 makefile                    |  16 ++++++++++++++--
 makewinx.cfg                |  10 +++++++---
 uninstall.bat               |   2 ++
 wsl~.bat                    |  12 ++++++++++++
 6 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100755 Bash ~ on UoW in Mintty.lnk
 create mode 100755 wsl~.bat

diff --git a/Bash ~ on UoW in Mintty.lnk b/Bash ~ on UoW in Mintty.lnk
new file mode 100755
index 0000000000000000000000000000000000000000..97bf13cc153d377c203c6a3675ae0641cf1382d7
GIT binary patch
literal 1903
zcmd^<T}YEr7{~w937M<RhKWeci>YYNEHA{edfl9xtu~yB%QtabONW~iH`s(eM50&`
zhEW&<2_j)cmj)$afpk+|Xx(%pbkWC+Lf-ZLKl_j=R`>S2Jm;MEd7txpp7We@UJC$)
zI*lzb6Ki2y;j4z@+PV{u3sv)q!9C82;jDQDqTfnSWwO7kjCm^J{;RDjtp<Ay4f*Mg
z{-gH|(b<+;KYR8s6+wX_EI-SppCj@P781q>r^4GwPWEaHA%p_xjdo)$Dr3ZA^MlD8
zNPT?<XUIuQDBsa>dvU>Zy=(Wu>7|k<v#-A{-s@_Wq7AbzduFCC9z!OSj8kk@Pl~xZ
z&QabFs4b#Nk)e)DkkH4+04L)LdL3+uxMk+R>1<d6Zl@22Q<%aon0XsAqghs15P+LB
zAHCFQUgep{3kQ9n&;W2GK@_wyvnfV={!t`XCYp5;Mv$}+A5KLs8dsUd_H4Mky{KNp
zGq#Hie|!>{V$rM<7rf}DEeD-A0I`q7W@$<Tzqgm!={yk+U`!#Fnh%W#V%28>DiqB+
z@yCeq40Z4zLIv`vUDN`qI3=R5q6#@n&7-DM9Z}U*aV|oEaKIn*LSG}d1U>yhSs3KR
z-pjGQkmD7Uxo9~x-EGjK1$NY<iCfqND;HqqR@Bp8k8(coB5F7aK$Egb9@IilOWdwU
zH@B{z1^2MrwPZGvRL%lxP=R>iDiSOg{k%BCC3<4>^|%o0Lu-6p<ON9;5qvCxma(mj
zD6yBAtBuD`VibvAWO_vC9porEPsbQ;=B#F=6u_9)V%19)$!0T1&64&{^<XtOvHZP;
zsn<o+Q5<#|8z0e4T%`YCY2v4m!8`GbQp2(M!DR9M+>W^wh51$EWz*X?$Cb;&;#((`
zS7@w_y^!S3CjJHtS-qnf=l7i)|MI9iJm8+V^5Wq&MdZWIJFTkuk-9Al|N34+P$u~z
dhf2H6{{Cv4aoSR?fBJpb&7x8NTr!U6e*^ax22KC~

literal 0
HcmV?d00001

diff --git a/install.bat b/install.bat
index a136798..03c7e13 100755
--- a/install.bat
+++ b/install.bat
@@ -9,8 +9,10 @@ copy LICENSE.wslbridge "%LOCALAPPDATA%\wsltty"
 copy uninstall.bat "%LOCALAPPDATA%\wsltty"
 
 copy wsl.bat "%LOCALAPPDATA%\wsltty"
+copy wsl~.bat "%LOCALAPPDATA%\wsltty"
 rem does not work without admin rights:
 rem copy wsl.bat "%SYSTEMROOT%\System32"
+rem copy wsl~.bat "%SYSTEMROOT%\System32"
 
 mkdir "%LOCALAPPDATA%\wsltty\bin"
 copy cygwin1.dll "%LOCALAPPDATA%\wsltty\bin"
@@ -29,9 +31,11 @@ mkdir "%LOCALAPPDATA%\wsltty\home\%USERNAME%"
 
 rem create Desktop Shorcut
 copy "Bash on UoW in Mintty.lnk" "%USERPROFILE%\Desktop"
+copy "Bash ~ on UoW in Mintty.lnk" "%USERPROFILE%\Desktop"
 
 rem create Start Menu Shortcut
 copy "Bash on UoW in Mintty.lnk" "%APPDATA%\Microsoft\Windows\Start Menu"
+copy "Bash ~ on UoW in Mintty.lnk" "%APPDATA%\Microsoft\Windows\Start Menu"
 
 
 :explorer
@@ -54,11 +58,12 @@ set shell=/bin/bash
 rem Mintty invocation
 set cmd=%LOCALAPPDATA%\wsltty\bin\mintty.exe
 set cset=-o Locale=C -o Charset=UTF-8
+set opts=--wsl
 set icon=%LOCALAPPDATA%\lxss\bash.ico
 set arg=/bin/wslbridge -t %shell%
-set target0=\"%cmd%\" %cset% -i \"%icon%\" %arg%
-rem set target1=\"%cmd%\" %cset% -i \"%icon%\" /bin/dash -c \"cd '%%1'; exec %arg%\"
-set target1=\"%cmd%\" %cset% -i \"%icon%\" --dir \"%%1\" %arg%
+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%
 
 reg add "%userdirname%\wsltty" /d "%label% %here%" /f
 reg add "%userdirname%\wsltty" /v Icon /d "%icon%" /f
diff --git a/makefile b/makefile
index c17f609..0262ad7 100644
--- a/makefile
+++ b/makefile
@@ -1,8 +1,8 @@
 #############################################################################
 # default: generate all
-all:	wslbridge mintty cygwin wsltty pkg
+all:	check wslbridge mintty cygwin wsltty pkg
 
-ver=0.6.2
+ver=0.6.3
 wslbridgever=0.2.0
 
 TARGET := $(shell $(CC) -dumpmachine)
@@ -21,6 +21,16 @@ endif
 
 wget=curl -R -L -O --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, and to ensure 
+# the path name drag-and-drop adaptation works
+
+check:
+	uname | grep CYGWIN
+	uname -m | grep i686
+
 #############################################################################
 # generation
 
@@ -60,7 +70,9 @@ pkg:
 	cp LICENSE.mintty rel/
 	cp LICENSE.wslbridge rel/
 	cp "Bash on UoW in Mintty.lnk" rel/
+	cp "Bash ~ on UoW in Mintty.lnk" rel/
 	cp wsl.bat rel/
+	cp wsl~.bat rel/
 	cp install.bat rel/
 	cp uninstall.bat rel/
 	cd rel; iexpress /n wsltty.SED
diff --git a/makewinx.cfg b/makewinx.cfg
index 438ec88..c57904c 100644
--- a/makewinx.cfg
+++ b/makewinx.cfg
@@ -40,9 +40,11 @@ FILE4="wslbridge-backend"
 FILE5="LICENSE.mintty"
 FILE6="LICENSE.wslbridge"
 FILE7="Bash on UoW in Mintty.lnk"
-FILE8="wsl.bat"
-FILE9="install.bat"
-FILE10="uninstall.bat"
+FILE8="Bash ~ on UoW in Mintty.lnk"
+FILE9="wsl.bat"
+FILE10="wsl~.bat"
+FILE11="install.bat"
+FILE12="uninstall.bat"
 
 [SourceFiles]
 SourceFiles0=.
@@ -59,4 +61,6 @@ SourceFiles0=.
 %FILE8%=
 %FILE9%=
 %FILE10%=
+%FILE11%=
+%FILE12%=
 
diff --git a/uninstall.bat b/uninstall.bat
index f3b8ee7..8540565 100755
--- a/uninstall.bat
+++ b/uninstall.bat
@@ -11,7 +11,9 @@ rem in any case, at least the config file (home\...) should not be removed
 
 rem delete Desktop Shortcut and Start Menu Shortcut
 del "%USERPROFILE%\Desktop\Bash on UoW in Mintty.lnk"
+del "%USERPROFILE%\Desktop\Bash ~ on UoW in Mintty.lnk"
 del "%APPDATA%\Microsoft\Windows\Start Menu\Bash on UoW in Mintty.lnk"
+del "%APPDATA%\Microsoft\Windows\Start Menu\Bash ~ on UoW in Mintty.lnk"
 
 
 :explorer
diff --git a/wsl~.bat b/wsl~.bat
new file mode 100755
index 0000000..29c562e
--- /dev/null
+++ b/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 -l
+