3.7.4

LICENSE.mintty

@@ -1,4 +1,4 @@
-mintty is copyright 2008-22 Andy Koppe, 2015-22 Thomas Wolff.
+mintty is copyright 2008-23 Andy Koppe, 2015-23 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.

README.md

@@ -11,13 +11,21 @@ WSLtty components
   (“home”-located configuration files from a previously installed version 
   will be migrated to the new default location)
 * Start Menu shortcuts to start WSL terminals
+* Desktop shorcut to start a terminal for the default WSL distribution
 * `*.bat` scripts to invoke WSL terminals from the command line
 * optional context menu entries for Windows Explorer to start WSL terminals in the respective folder
 * install/uninstall context menu items from Start Menu subfolder `WSLtty`
 
 ---
 
-### Requirement ###
+### Requirements ###
+
+Wsltty does not seem to work with WSL V2 mode since release 2.0.0 (#343).
+As a workaround until a solution in the wslbridge gateway, it is suggested 
+to install [release 1.3.17](https://github.com/microsoft/WSL/releases/tag/1.3.17); 
+maybe uninstall WSL first, see [issue 343 comment](https://github.com/mintty/wsltty/issues/343#issuecomment-1818367512).
+Another remedy could be to configure your WSL distributions to run in WSL V1 mode, for example:
+`wsl --set-version Ubuntu 1`.
 
 Since release 3.0.5, WSLtty requires Windows version 1809 (the November 2018 release).
 
@@ -27,8 +35,10 @@ Since release 3.0.5, WSLtty requires Windows version 1809 (the November 2018 rel
 
 #### WSLtty installer ([Download](https://github.com/mintty/wsltty/releases) standalone installation) ####
 
-Run the [installer](https://github.com/mintty/wsltty/releases) to install 
+From the [release downloads](https://github.com/mintty/wsltty/releases), 
-the components listed above.
+run the wsltty-VERSION-x86_64-install.exe installer to install 
+the components listed above. Make sure to select a 64-bit installer 
+on a 64-bit system.
 If Windows complains with a “Windows protected your PC” popup, 
 you may need to click “Run anyway” to proceed with the installation.
 You may need to open the Properties of the installer first, tab “General” 
@@ -53,6 +63,11 @@ release also contains a `.cab` file. Download it, open it, extract its files
 to some temporary deployment directory, and invoke `install.bat` from there, 
 or `install-portable.bat` for a portable installation.
 
+#### Quiet installer ####
+
+The wsltty-VERSION-x86_64-install-quiet.exe installer is intended for 
+integration in another installation framework.
+
 #### Installation from source repository ####
 
 Checkout the wsltty repository, or download the source archive, unpack and rename the directory to `wsltty`.
@@ -65,6 +80,12 @@ environment for this purpose would be installed with the
 from [cygwin.com](https://cygwin.com/), 
 with additional packages `make`, `gcc-g++`, `unzip`, `zoo`, `patch`, (`lcab`).
 
+#### Build installers ####
+
+Install a minimal Cygwin environment plus the additional packages as 
+listed for «Installation from source repository».
+Invoke `make pkg` or just `make`.
+
 #### Installation to non-default locations ####
 
 (For experts)
@@ -78,6 +99,7 @@ Note: These are 3rd-party packages, not managed by this repository.
 
 #### Windows Package Manager ####
 
+([Check package](https://github.com/microsoft/winget-pkgs/tree/master/manifests/m/Mintty/WSLtty))
 To install wsltty from the 
 [Windows Package Manager Community Repository](https://github.com/microsoft/winget-pkgs), 
 invoke one of
@@ -86,6 +108,7 @@ invoke one of
 
 #### Chocolatey ####
 
+([Check package](https://community.chocolatey.org/packages/wsltty))
 If you use the [Chocolatey package manager](https://chocolatey.org/), 
 invoke one of
 * `choco install wsltty`
@@ -93,6 +116,7 @@ invoke one of
 
 #### Scoop ####
 
+([Check package](https://scoop.sh/#/apps?q=wsltty))
 If you use the [Scoop package manager](https://scoop.sh/), 
 * `scoop bucket add extras`
 
@@ -113,7 +137,7 @@ To uninstall wsltty software completely, remove the installation folder manually
 
 WSLtty can be invoked with
 * installed Start Menu shortcuts (or Desktop shortcuts if copied there)
-* *.bat scripts (optionally with WSL command as parameters)
+* *.bat scripts (optionally with WSL command as parameters) (see [Command line scripts](#command-line-scripts-wslbat) below)
 * Explorer context menu (if installed from the Start Menu `WSLtty` subfolder)
 
 Starting the mintty terminal directly from the WSLtty installation location 
@@ -174,7 +198,7 @@ from the Start Menu if desired.
 The Start menu folder WSLtty contains the link 
 <img align=absmiddle height=25 src=https://user-images.githubusercontent.com/12740416/57078483-a7846a00-6cee-11e9-9c5e-8c2e9e56cae4.png>`configure WSL shortcuts`.
 This function is initially run when wsltty is installed.
-If should be rerun after adding or removing WSL distributions, 
+It should be rerun after adding or removing WSL distributions, 
 in order to create the respective set of shortcuts in the Start menu.
 
 #### Command line scripts `wsl*.bat` ####
@@ -210,7 +234,7 @@ Start Menu subfolder `WSLtty`:
 
 Wsltty installation and the mintty terminal try to use the icon of the 
 respective WSL distribution. If it cannot be determined, a penguin icon 
-is used as a default. You can replace it with your preferred fallback icon 
+is used as a fallback. You can replace it with your preferred default icon 
 by replacing the icon file `%LOCALAPPDATA%\wsltty\wsl.ico`.
 
 #### Mintty settings ####
@@ -241,6 +265,20 @@ Note:
   If you define `HOME` at Windows level, this changes accordingly.
   Note, however, that the WSL `$HOME` is a completely different setting.
 
+#### Emoji deployment ####
+
+Mintty and the wsltty package do not bundle actual emoji graphics but 
+there are scripts to support easy download and deployment.
+If you have another instance of mintty installed (e.g. in cygwin) 
+and have emojis deployed already in the common config folder 
+`%APPDATA%\mintty\emojis`, they will be reused by wsltty.
+
+To deploy emojis standalone for wsltty, use the scripts installed in 
+`%APPDATA%\wsltty\emojis` within WSL:
+* `cd $(wslpath "$APPDATA/wsltty/emojis")`
+* `getemojis` to provide emoji graphics as listed by Unicode.org
+* `getflags` to provide emoji flag graphics (extending Unicode dynamically) from various sources
+
 #### Shell selection and Login shell ####
 
 The WSLtty deployment does not impose a shell preference;

VERSION

@@ -1 +1 @@
-3.6.1
+3.7.4

install.bat

@@ -71,7 +71,7 @@ rem copy cygpopt-0.dll "%installdir%"\bin
 rem copy cygiconv-2.dll "%installdir%"\bin
 rem copy cygintl-8.dll "%installdir%"\bin
 
-rem create system config directory and copy config archive
+rem create system config directory and copy config archive and scripts
 mkdir "%installdir%\usr\share\mintty\lang" 2> nul:
 copy lang.zoo "%installdir%\usr\share\mintty\lang"
 mkdir "%installdir%\usr\share\mintty\themes" 2> nul:
@@ -83,6 +83,9 @@ copy charnames.txt "%installdir%\usr\share\mintty\info"
 mkdir "%installdir%\usr\share\mintty\icon" 2> nul:
 copy tux.ico "%installdir%\usr\share\mintty\icon"
 copy mintty.ico "%installdir%\usr\share\mintty\icon"
+mkdir "%installdir%\usr\share\mintty\emojis" 2> nul:
+copy getemojis "%installdir%\usr\share\mintty\emojis" 2> nul:
+copy getflags "%installdir%\usr\share\mintty\emojis" 2> nul:
 
 
 rem create Start Menu Folder
@@ -131,10 +134,13 @@ rmdir "%oldroot%\home" 2> nul:
 
 :userconfig
 
-rem create user config directory and subfolders
+rem create user config directory and subfolders, copy scripts
 mkdir "%configdir%\lang" 2> nul:
 mkdir "%configdir%\themes" 2> nul:
 mkdir "%configdir%\sounds" 2> nul:
+mkdir "%configdir%\emojis" 2> nul:
+copy "%installdir%\usr\share\mintty\emojis\getemojis" "%configdir%\emojis" 2> nul:
+copy "%installdir%\usr\share\mintty\emojis\getflags" "%configdir%\emojis" 2> nul:
 
 rem create config file if it does not yet exist
 if exist "%configdir%\config" goto appconfig

makefile

@@ -10,16 +10,16 @@
 
 
 # wsltty release
-ver=3.6.1
+ver=3.7.4
 
 # wsltty appx release - must have 4 parts!
-verx=3.6.1.0
+verx=3.7.4.1
 
 
 ##############################
 # mintty release version
 
-minttyver=3.6.1
+minttyver=3.7.4
 
 ##############################
 
@@ -27,7 +27,7 @@ minttyver=3.6.1
 repo=Biswa96/wslbridge2
 
 # wslbridge2 master release version
-wslbridgever=0.9
+wslbridgever=0.12
 
 # wslbridge2 latest version
 #archive=master
@@ -73,10 +73,15 @@ WINSDKVER=`regtool list '$(WINSDKKEY)' | sed -e '$$ q' -e d`
 
 all:	all-$(notdir $(CURDIR))
 
-all-wsltty:	check pkg
+# targets and version checking
+
+all-wsltty:	check committed pkg
 
 all-wsltty.appx:	appx
 
+committed:
+	if git status -suno | sed -e "s,^..,," | grep .; then false; fi
+
 #############################################################################
 # target checking and some defs
 
@@ -148,13 +153,12 @@ $(wslbridgedir).zip:
 wslbridge-source:	$(wslbridgedir).zip
 	unzip -o $(wslbridgedir).zip
 	cp $(wslbridgedir)/LICENSE LICENSE.wslbridge2
-	# as a hotfix for #302, we assume the two patches are 
+	# the following two patches are obsolete with wslbridge2 v0.9
-	# not needed anymore for wslbridge2 v0.9
 	# patch to fix #220
 	# test case in mintty: (sleep 0.1; echo -e "\e[31;80t") & wslbridge2
-	##cd $(wslbridgedir); patch -p1 < ../0001-notify-size-change-inband.patch
+	#cd $(wslbridgedir); patch -p1 < ../0001-notify-size-change-inband.patch
 	# patch to https://github.com/Biswa96/wslbridge2/commit/41575379b416703c49e2687e957440239a4cdfb7
-	##cd $(wslbridgedir); patch -p0 < ../0002-add-com-for-lifted-wsl.patch
+	#cd $(wslbridgedir); patch -p0 < ../0002-add-com-for-lifted-wsl.patch
 
 wslbridge-frontend:	wslbridge-source
 	echo ------------- Compiling wslbridge2 frontend
@@ -217,7 +221,7 @@ mintty-pkg:
 
 mintty-appx:
 	mkdir -p usr/share/mintty
-	cd usr/share/mintty; mkdir -p lang themes sounds info
+	cd usr/share/mintty; mkdir -p lang themes sounds info emojis
 	cp mintty-$(minttyver)/lang/*.po usr/share/mintty/lang/
 	cp mintty-$(minttyver)/themes/*[!~] usr/share/mintty/themes/
 	cp mintty-$(minttyver)/sounds/*.wav usr/share/mintty/sounds/
@@ -225,6 +229,7 @@ mintty-appx:
 	# add charnames.txt to support "Character Info"
 	cd mintty-$(minttyver)/src; sh ./mknames
 	cp mintty-$(minttyver)/src/charnames.txt usr/share/mintty/info/
+	cp /usr/share/mintty/emojis/get*[!~] usr/share/mintty/emojis/
 
 cygwin:	# mkshortcutexe
 	mkdir -p bin
@@ -277,6 +282,7 @@ copcab:	ver
 	cp *.bat $(CAB)/
 	cp config-distros.sh $(CAB)/
 	cp mkshortcut.vbs $(CAB)/
+	cp mintty-$(minttyver)/tools/get*[!~] $(CAB)/
 
 cop:	copcab
 	mkdir -p rel

makewinx.cfg

@@ -61,6 +61,8 @@ FILE25="mkshortcut.vbs"
 FILE26="dequote.bat"
 FILE27="cmd2.bat"
 FILE28="install-portable.bat"
+FILE29="getemojis"
+FILE30="getflags"
 
 [SourceFiles]
 SourceFiles0=.
@@ -95,4 +97,6 @@ SourceFiles0=.
 %FILE26%=
 %FILE27%=
 %FILE28%=
+%FILE29%=
+%FILE30%=