0.7.6

README.md

@@ -11,9 +11,12 @@ Run the [installer](https://github.com/mintty/wsltty/releases) to install
 * `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
 
+If Windows complains with a “Windows protected your PC” popup, 
+you may need to click “Run anyway” to proceed with the installation.
+
 ### Configuration ###
 
-#### Command line scripts wsl*.bat ####
+#### 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
@@ -49,9 +52,18 @@ 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).
 
+#### Shell selection ####
+
+To invoke your favourite shell, simply replace `/bin/bash` with its pathname 
+in the Desktop shortcuts, `wsl*.bat` invocation scripts, 
+or Explorer context menu commands (configured in `config-context-menu.bat`).
+
 ### Components ###
 
-For mintty, see the [Mintty homepage](http://mintty.github.io/).
+For mintty, see the [Mintty homepage](http://mintty.github.io/), 
+then [Mintty manual page](http://mintty.github.io/mintty.1.html), 
+and the [Mintty Wiki](https://github.com/mintty/mintty/wiki), 
+including a [Hints and Tips page](https://github.com/mintty/mintty/wiki/Tips).
 
 It is based on [Cygwin](http://cygwin.com) 
 and includes its runtime library ([sources](http://mirrors.dotsrc.org/cygwin/x86/release/cygwin)).

install.bat

@@ -31,6 +31,7 @@ copy cygwin1.dll "%installdir%\bin"
 copy cygwin-console-helper.exe "%installdir%\bin"
 rem copy dash.exe "%installdir%\bin"
 copy mintty.exe "%installdir%\bin"
+copy zoo.exe "%installdir%\bin"
 copy wslbridge.exe "%installdir%\bin"
 copy wslbridge-backend "%installdir%\bin"
 
@@ -38,6 +39,15 @@ rem create "home directory" to enable storage of config file
 mkdir "%installdir%\home
 mkdir "%installdir%\home\%USERNAME%"
 
+rem create "config directory" and copy config archive
+mkdir "%installdir%\home\%USERNAME%\.config"
+mkdir "%installdir%\home\%USERNAME%\.config\mintty"
+mkdir "%installdir%\home\%USERNAME%\.config\mintty\lang"
+copy po.zoo "%installdir%\home\%USERNAME%\.config\mintty\lang"
+
+rem create "temp directory" for version checking
+mkdir "%installdir%\tmp
+
 
 :shortcuts
 
@@ -58,4 +68,11 @@ copy "WSL Bash %% in Mintty.lnk" "%USERPROFILE%\Desktop"
 copy "WSL Bash ~ in Mintty.lnk" "%USERPROFILE%\Desktop"
 
 
+:config
+
+rem unpack config files
+cd /D "%installdir%\home\%USERNAME%\.config\mintty\lang"
+"%installdir%\bin\zoo" x po
+
+
 :end

makefile

@@ -1,13 +1,19 @@
 #############################################################################
-# default: generate all
+# 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
+
 all:	check pkg
 
 # wsltty release
-ver=0.7.3
+ver=0.7.6
 
 # mintty release version
-minver=2.7.3
+minttyver=2.7.6
-#minver=master
+#minttyver=master
 
 # wslbridge backend version
 wslbridgever=0.2.1
@@ -49,7 +55,9 @@ check:
 	# 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
+	#uname -m | grep i686
+	# check 64 bit (vs 32 bit) to provide 64-Bit stability support:
+	uname -m | grep x86_64
 
 #############################################################################
 # generation
@@ -72,29 +80,36 @@ wslbridge-frontend:
 	cp wslbridge-master/out/wslbridge.exe bin/
 	cp wslbridge-master/LICENSE.txt LICENSE.wslbridge
 
-mintty:
+mintty:	mintty-get mintty-build
-	$(wgeto) https://github.com/mintty/mintty/archive/$(minver).zip -o mintty-$(minver).zip
+
-	unzip -o mintty-$(minver).zip
+mintty-get:
-	cd mintty-$(minver)/src; make LDFLAGS="-static -static-libgcc -s"
+	$(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip
+	unzip -o mintty-$(minttyver).zip
+
+mintty-build:
+	cd mintty-$(minttyver)/src; make LDFLAGS="-static -static-libgcc -s"
 	mkdir -p bin
-	cp mintty-$(minver)/bin/mintty.exe bin/
+	cp mintty-$(minttyver)/bin/mintty.exe bin/
-	cp mintty-$(minver)/LICENSE LICENSE.mintty
+	cp mintty-$(minttyver)/LICENSE LICENSE.mintty
+	cd mintty-$(minttyver)/lang; zoo a po *.po; mv po.zoo ../../
 
 cygwin:
 	mkdir -p bin
 	cp /bin/cygwin1.dll bin/
 	cp /bin/cygwin-console-helper.exe bin/
 	#cp /bin/dash.exe bin/
+	cp /bin/zoo.exe bin/
 
-wsltty:
+cab:
-
-pkg:	wslbridge mintty cygwin wsltty
 	mkdir -p rel
+	rm -fr rel/wsltty-$(ver)-install.exe
 	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/mintty.exe rel/
+	cp bin/zoo.exe rel/
+	cp po.zoo rel/
 	cp bin/wslbridge.exe rel/
 	cp bin/wslbridge-backend rel/
 	cp LICENSE.* rel/
@@ -103,5 +118,9 @@ pkg:	wslbridge mintty cygwin wsltty
 	cp *.bat rel/
 	cd rel; iexpress /n wsltty.SED
 
+pkg:	wslbridge cygwin mintty cab
+
+wsltty:	wslbridge cygwin mintty-build cab
+
 #############################################################################
 # end

makewinx.cfg

@@ -51,6 +51,8 @@ FILE15="config-context-menu.bat"
 FILE16="add to context menu.lnk"
 FILE17="remove from context menu.lnk"
 FILE18="wsltty home & help.url"
+FILE19="zoo.exe"
+FILE20="po.zoo"
 
 [SourceFiles]
 SourceFiles0=.
@@ -75,4 +77,6 @@ SourceFiles0=.
 %FILE16%=
 %FILE17%=
 %FILE18%=
+%FILE19%=
+%FILE20%=