deploy terminfo files, in order to support pty mode for wsl.exe

README.md

@@ -114,14 +114,6 @@ invoke one of
 * `winget install wsltty`
 * `winget upgrade wsltty`
 
-#### 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`
-* `choco upgrade wsltty`
-
 #### Scoop ####
 
 ([Check package](https://scoop.sh/#/apps?q=wsltty))
@@ -132,6 +124,14 @@ then, invoke one of
 * `scoop install wsltty`
 * `scoop update wsltty`
 
+#### 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`
+* `choco upgrade wsltty`
+
 ### Uninstallation ###
 
 To uninstall wsltty desktop, start menu, and context menu integration:
@@ -218,6 +218,8 @@ WSLtty installs the following scripts into `%LOCALAPPDATA%\Microsoft\WindowsApps
 * For each installed WSL distribution, e.g. Ubuntu, a command script like `Ubuntu~.bat` to start in the WSL user home
 * `WSL.bat` and `WSL~.bat` to start the default WSL distribution
 
+The scripts accept an optional invocation command (since 3.7.8).
+
 Given that `%LOCALAPPDATA%\Microsoft\WindowsApps` is in your PATH,
 the scripts can be invoked from cmd.exe, PowerShell, or via WIN+R.
 
@@ -330,13 +332,13 @@ the [Mintty manual page](http://mintty.github.io/mintty.1.html),
 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)).
+and includes its runtime library ([sources](http://mirrors.dotsrc.org/cygwin/x86_64/release/cygwin)).
 
 For interacting with WSL, [wslbridge](https://github.com/rprichard/wslbridge)
 used to be the gateway prototype.
 Many thanks for this enabling gateway go to Ryan Prichard.
 
-For recent changes in WSL, particularly WSL mode V2, the new gateway 
+For later changes in WSL, particularly WSL mode V2, the new gateway 
-[wslbridge2](https://github.com/Biswa96/wslbridge2) is used instead.
+[wslbridge2](https://github.com/Biswa96/wslbridge2) was used instead.
 Many thanks for this further development and maintenance go to Biswapriyo Nath.
 

VERSION

@@ -1 +1 @@
-3.7.7
+3.7.8

config-distros.sh

@@ -155,17 +155,40 @@ regtool () {
 }
 fi
 
+mkbat () {
+	echo Creating "$1.bat"
+	while read line; do echo "$line"; done <<-\/EOB > "$1".bat
+	@echo off
+	rem Start mintty terminal for WSL
 	
-if $config
+	rem get basename of this script file,
-then while read line; do echo "$line"; done <</EOB > mkbat.bat
+	rem use it to select WSL distribution and homedir flag
-@echo off
+	set dist=%~n0
-echo Creating %1.bat
 	
-echo @echo off> %1.bat
+	rem start in current directory
-echo rem Start mintty terminal for WSL package %name% in current directory>> %1.bat
+	set cdir=
-echo %target% -i "%icon%" %minttyargs% %bridgeargs% %%*>> %1.bat
+	rem if script name ends with ~, extract WSL distribution and param -~
-/EOB
+	if "%dist:~-1%" == "~" set cdir=-~ && set dist=%dist:~0,-1%
-fi
+	rem map WSL default distribution
+	if "%dist%" == "WSL" set dist=
+	
+	rem check if we have an explicit -d DIST parameter
+	if "%1" == "-d" set dist=%2 && shift && shift
+	
+	chcp 65001 > nul:
+	
+	if "%1" == "" goto login
+	
+	:cmd
+	"%LOCALAPPDATA%/wsltty/bin/mintty.exe" -i "%LOCALAPPDATA%/wsltty/wsl.ico" --WSL="%dist%" --configdir="%APPDATA%/wsltty" %cdir% %*
+	goto end
+	
+	:login
+	"%LOCALAPPDATA%/wsltty/bin/mintty.exe" -i "%LOCALAPPDATA%/wsltty/wsl.ico" --WSL="%dist%" --configdir="%APPDATA%/wsltty" %cdir% -
+	
+	:end
+	/EOB
+}
 
 if $custominst && $config && ! $remove
 then
@@ -366,7 +389,8 @@ config () {
         copy "$name Terminal %.lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
 
         # launch script in . -> WSLtty home, WindowsApps launch folder
-        cmd /C mkbat.bat "$name"
+        #cmd /C mkbat.bat "$name"
+        mkbat "$name"
         copy "$name.bat" "$LOCALAPPDATA\\Microsoft\\WindowsApps"
 
         # store backup copies in installation dir
@@ -402,7 +426,8 @@ config () {
         fi
 
         # launch script in ~ -> WSLtty home, WindowsApps launch folder
-        cmd /C mkbat.bat "$name~"
+        #cmd /C mkbat.bat "$name~"
+        mkbat "$name~"
         copy "$name~.bat" "$LOCALAPPDATA\\Microsoft\\WindowsApps"
 
         # store backup copies in installation dir

install.bat

@@ -95,6 +95,8 @@ 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:
+mkdir "%installdir%\usr\share\terminfo" 2> nul:
+copy terminfo.zoo "%installdir%\usr\share\terminfo"
 
 
 rem create Start Menu Folder
@@ -122,6 +124,8 @@ cd /D "%installdir%\usr\share\mintty\themes"
 "%installdir%\bin\zoo" xO themes
 cd /D "%installdir%\usr\share\mintty\sounds"
 "%installdir%\bin\zoo" xO sounds
+cd /D "%installdir%\usr\share\terminfo"
+"%installdir%\bin\zoo" xO terminfo
 cd /D "%installdir%"
 
 

makefile

@@ -10,16 +10,16 @@
 
 
 # wsltty release
-ver=3.7.7
+ver=3.7.8
 
 # wsltty appx release - must have 4 parts!
-verx=3.7.7.1
+verx=3.7.8.1
 
 
 ##############################
 # mintty release version
 
-minttyver=3.7.7
+minttyver=3.7.8
 
 minrepo=git@github.com:mintty/mintty.git
 
@@ -229,11 +229,18 @@ mintty-build-appx:
 	cp mintty-$(minttyver)/bin/mintty.exe bin/
 	strip bin/mintty.exe
 
+terminfoxt=78/xterm 78/xterm-vt220 78/xterm-256color 78/xterm-direct
+terminfovt=76/vt100 76/vt220 76/vt340 76/vt420 76/vt525
+terminfomt=6d/mintty 6d/mintty-direct
+terminfo=$(terminfoxt) $(terminfovt) $(terminfomt)
+
 mintty-pkg:
 	cp mintty-$(minttyver)/LICENSE LICENSE.mintty
 	cd mintty-$(minttyver)/lang; zoo a lang *.po; mv lang.zoo ../../
 	cd mintty-$(minttyver)/themes; zoo a themes *[!~]; mv themes.zoo ../../
 	cd mintty-$(minttyver)/sounds; zoo a sounds *.wav *.WAV *.md; mv sounds.zoo ../../
+	cd /usr/share/terminfo; zoo a /tmp/terminfo $(terminfo)
+	mv /tmp/terminfo.zoo .
 	# add charnames.txt to support "Character Info"
 	cd mintty-$(minttyver)/src; sh ./mknames
 	cp mintty-$(minttyver)/src/charnames.txt .
@@ -285,6 +292,7 @@ copcab:	ver
 	cp lang.zoo $(CAB)/
 	cp themes.zoo $(CAB)/
 	cp sounds.zoo $(CAB)/
+	cp terminfo.zoo $(CAB)/
 	cp charnames.txt $(CAB)/
 	cp bin/wslbridge2.exe $(CAB)/
 	cp bin/wslbridge2-backend $(CAB)/

makewinx.cfg

@@ -1,5 +1,5 @@
 [Version]
-Class=IEXPRESS
+Class=IExpress
 SEDVersion=3
 
 [Options]
@@ -32,71 +32,41 @@ AppLaunched=cmd.exe /c install.bat
 PostInstallCmd=<None>
 AdminQuietInstCmd=
 UserQuietInstCmd=
-FILE0="cygwin1.dll"
-FILE1="cygwin-console-helper.exe"
-FILE2="mintty.exe"
-FILE3="wslbridge2.exe"
-FILE4="wslbridge2-backend"
-FILE5="LICENSE.mintty"
-FILE6="LICENSE.wslbridge2"
-FILE7="config-distros.sh"
-FILE8="configure WSL shortcuts.lnk"
-FILE9="charnames.txt"
-FILE10="VERSION"
-FILE11="dash.exe"
-FILE12="regtool.exe"
-FILE13="install.bat"
-FILE14="uninstall.bat"
-FILE15="tux.ico"
-FILE16="add to context menu.lnk"
-FILE17="add default to context menu.lnk"
-FILE18="remove from context menu.lnk"
-FILE19="wsltty home & help.url"
-FILE20="zoo.exe"
-FILE21="lang.zoo"
-FILE22="themes.zoo"
-FILE23="sounds.zoo"
-FILE24="mintty.ico"
-FILE25="mkshortcut.vbs"
-FILE26="dequote.bat"
-FILE27="cmd2.bat"
-FILE28="install-portable.bat"
-FILE29="getemojis"
-FILE30="getflags"
 
 [SourceFiles]
 SourceFiles0=.
 
 [SourceFiles0]
-%FILE0%=
+cygwin1.dll=
-%FILE1%=
+cygwin-console-helper.exe=
-%FILE2%=
+mintty.exe=
-%FILE3%=
+wslbridge2.exe=
-%FILE4%=
+wslbridge2-backend=
-%FILE5%=
+LICENSE.mintty=
-%FILE6%=
+LICENSE.wslbridge2=
-%FILE7%=
+config-distros.sh=
-%FILE8%=
+configure WSL shortcuts.lnk=
-%FILE9%=
+charnames.txt=
-%FILE10%=
+VERSION=
-%FILE11%=
+dash.exe=
-%FILE12%=
+regtool.exe=
-%FILE13%=
+install.bat=
-%FILE14%=
+uninstall.bat=
-%FILE15%=
+tux.ico=
-%FILE16%=
+add to context menu.lnk=
-%FILE17%=
+add default to context menu.lnk=
-%FILE18%=
+remove from context menu.lnk=
-%FILE19%=
+wsltty home & help.url=
-%FILE20%=
+zoo.exe=
-%FILE21%=
+lang.zoo=
-%FILE22%=
+themes.zoo=
-%FILE23%=
+sounds.zoo=
-%FILE24%=
+terminfo.zoo=
-%FILE25%=
+mintty.ico=
-%FILE26%=
+mkshortcut.vbs=
-%FILE27%=
+dequote.bat=
-%FILE28%=
+cmd2.bat=
-%FILE29%=
+install-portable.bat=
-%FILE30%=
+getemojis=
+getflags=