3.6.4

README.md

@@ -241,6 +241,19 @@ 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`:
+* `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.6.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.6.4
 
 # wsltty appx release - must have 4 parts!
-verx=3.6.1.0
+verx=3.6.4.1
 
 
 ##############################
 # mintty release version
 
-minttyver=3.6.1
+minttyver=3.6.4
 
 ##############################
 
@@ -27,7 +27,7 @@ minttyver=3.6.1
 repo=Biswa96/wslbridge2
 
 # wslbridge2 master release version
-wslbridgever=0.9
+wslbridgever=0.11
 
 # wslbridge2 latest version
 #archive=master
@@ -148,13 +148,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 
-	# not needed anymore for wslbridge2 v0.9
+	# the following two patches are obsolete with 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 +216,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 +224,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 +277,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%=