3.6.5

update to mintty 3.6.1

0001-notify-size-change-inband.patch

@@ -1,36 +1,16 @@
-Date: Tue, 15 Sep 2020 06:15:34 +0200
-Subject: [PATCH] notify window size change via escaped inband information
- (Biswa96/wslbridge2#21, mintty/wsltty#220)
-Co-authored-by: Thomas Wolff <towo@towo.net>
-
----
- src/wslbridge2-backend.cpp | 87 +++++++++++++++++++++++++++++++++++++-
- src/wslbridge2.cpp         | 83 ++++++++++++++++++++++++++++++------
- 2 files changed, 155 insertions(+), 15 deletions(-)
-
 diff --git a/src/wslbridge2-backend.cpp b/src/wslbridge2-backend.cpp
-index b50ee9c..ad429ae 100644
+index 8b86cc6..63a19e5 100644
 --- a/src/wslbridge2-backend.cpp
 +++ b/src/wslbridge2-backend.cpp
-@@ -24,6 +24,7 @@
- #include <termios.h>
+@@ -17,6 +17,7 @@
+ #include <sys/wait.h>
  #include <unistd.h>
  #include <wordexp.h>
 +#include <limits.h> // PIPE_BUF
  
  #include <string>
  #include <vector>
-@@ -315,6 +316,9 @@ int main(int argc, char *argv[])
-         /* Use dupped master fd to read OR write */
-         const int mfd_dp = dup(mfd);
-         assert(mfd_dp > 0);
-+#ifdef debug_to_input
-+        FILE * debug = fdopen(mfd_dp, "w"); // for fprintf
-+#endif
- 
-         sigset_t set;
-         sigemptyset(&set);
-@@ -333,6 +337,7 @@ int main(int argc, char *argv[])
+@@ -196,6 +197,7 @@ int main(int argc, char *argv[])
  
          ssize_t readRet = 0, writeRet = 0;
          char data[1024]; /* Buffer to hold raw data from pty */
@@ -38,13 +18,12 @@ index b50ee9c..ad429ae 100644
  
          do
          {
-@@ -343,8 +348,86 @@ int main(int argc, char *argv[])
+@@ -206,8 +208,85 @@ int main(int argc, char *argv[])
              if (fds[0].revents & POLLIN)
              {
                  readRet = recv(ioSockets.inputSock, data, sizeof data, 0);
 -                if (readRet > 0)
 -                    writeRet = write(mfd_dp, data, readRet);
-+
 +                char * s = data;
 +                int len = readRet;
 +                writeRet = 1;
@@ -128,14 +107,13 @@ index b50ee9c..ad429ae 100644
  
              /* Resize window when buffer received in control socket */
 diff --git a/src/wslbridge2.cpp b/src/wslbridge2.cpp
-index 75ccb1b..e9fbbf7 100644
+index 300ad57..3ba9096 100644
 --- a/src/wslbridge2.cpp
 +++ b/src/wslbridge2.cpp
-@@ -56,32 +56,85 @@ union IoSockets
+@@ -43,19 +43,41 @@ union IoSockets
  /* global variable */
- static union IoSockets g_ioSockets = { 0, 0, 0 };
+ static volatile union IoSockets g_ioSockets = { 0 };
  
-+
 +#define dont_debug_inband
 +#define dont_use_controlsocket
 +
@@ -148,7 +126,7 @@ index 75ccb1b..e9fbbf7 100644
  
      /* Send terminal window size to control socket */
 -    ioctl(STDIN_FILENO, TIOCGWINSZ, &winp);
-     send(g_ioSockets.controlSock, &winp, sizeof winp, 0);
+     send(g_ioSockets.controlSock, (char *)&winp, sizeof winp, 0);
 +#else
 +    static char wins[2 + sizeof(struct winsize)] = {0, 16};
 +    static struct winsize * winsp = (struct winsize *)&wins[2];
@@ -171,27 +149,16 @@ index 75ccb1b..e9fbbf7 100644
  {
      int ret;
      char data[1024];
--
--    struct pollfd fds = { STDIN_FILENO, POLLIN, 0 };
 +    assert(sizeof data <= PIPE_BUF);
  
      while (1)
      {
-+#ifdef use_poll
-+        // we could poll on a single channel but we don't need to
-+        static struct pollfd fds = { STDIN_FILENO, POLLIN, 0 };
-         ret = poll(&fds, 1, -1);
- 
-         if (fds.revents & POLLIN)
-+#else
-+        if (1)
-+#endif
-         {
-             ret = read(STDIN_FILENO, data, sizeof data);
--            if (ret > 0)
--                ret = send(g_ioSockets.inputSock, data, ret, 0);
--            else
-+
+@@ -65,8 +87,33 @@ static void* send_buffer(void *param)
+             closesocket(g_ioSockets.inputSock);
+             break;
+         }
+-        if (!send(g_ioSockets.inputSock, data, ret, 0))
+-            break;
 +            char * s = data;
 +            int len = ret;
 +            while (ret > 0 && len > 0)
@@ -219,25 +186,27 @@ index 75ccb1b..e9fbbf7 100644
 +                    }
 +                }
 +            }
-+            if (ret <= 0)
-                 break;
-         }
-     }
-@@ -537,13 +590,6 @@ int main(int argc, char *argv[])
-         closesocket(controlSocket);
      }
  
--    /* Create thread to send window size through control socket */
--    struct sigaction act = {};
+     pthread_exit(&ret);
+@@ -480,16 +527,6 @@ int main(int argc, char *argv[])
+         g_ioSockets.controlSock = win_local_accept(controlSock);
+     }
+ 
+-    /* Capture window resize signal and send buffer to control socket */
+-    {
+-    struct sigaction act;
+-    memset(&act, 0, sizeof act);
 -    act.sa_handler = resize_window;
 -    act.sa_flags = SA_RESTART;
 -    ret = sigaction(SIGWINCH, &act, NULL);
 -    assert(ret == 0);
+-    }
 -
      /* Create thread to send input buffer to input socket */
      pthread_t tidInput;
      ret = pthread_create(&tidInput, nullptr, send_buffer, nullptr);
-@@ -556,6 +602,17 @@ int main(int argc, char *argv[])
+@@ -502,6 +539,17 @@ int main(int argc, char *argv[])
  
      termState.enterRawMode();
  

0002-add-com-for-lifted-wsl.patch

@@ -0,0 +1,62 @@
+diff -rup src/sav/GetVmId.cpp src/GetVmId.cpp
+--- src/sav/GetVmId.cpp	2021-04-27 13:50:51.000000000 +0000
++++ src/GetVmId.cpp	2022-02-03 19:43:53.684999800 +0000
+@@ -46,11 +46,24 @@ void ComInit(void)
+                                 EOAC_STATIC_CLOAKING, NULL);
+     assert(hRes == 0);
+ 
+-    hRes = CoCreateInstance(CLSID_LxssUserSession,
++    // First try with COM server in lifted WSL service
++    hRes = CoCreateInstance(CLSID_WslService,
+                             NULL,
+                             CLSCTX_LOCAL_SERVER,
+-                            IID_ILxssUserSession,
++                            IID_IWSLService,
+                             (PVOID *)&wslSession);
++
++
++    // Now try with COM server in system WSL service
++    if (FAILED(hRes))
++    {
++        hRes = CoCreateInstance(CLSID_LxssUserSession,
++                                NULL,
++                                CLSCTX_LOCAL_SERVER,
++                                IID_ILxssUserSession,
++                                (PVOID *)&wslSession);
++    }
++
+     assert(hRes == 0);
+ }
+ 
+diff -rup src/sav/LxssUserSession.hpp src/LxssUserSession.hpp
+--- src/sav/LxssUserSession.hpp	2021-04-27 13:50:51.000000000 +0000
++++ src/LxssUserSession.hpp	2022-02-03 19:45:22.846298200 +0000
+@@ -11,14 +11,26 @@
+ #ifndef LXSSUSERSESSION_H
+ #define LXSSUSERSESSION_H
+ 
+-/* Class identifier */
++// COM IDs for lifted WSL service
++static const GUID CLSID_WslService = {
++    0xF122531F,
++    0x326B,
++    0x4514,
++    { 0x85, 0xAE, 0xDC, 0x99, 0xD3, 0x1D, 0x82, 0x56 } };
++
++static const GUID IID_IWSLService = {
++    0x50047071,
++    0x122C,
++    0x4CAD,
++    { 0x9C, 0x93, 0x94, 0x72, 0x0E, 0xB7, 0x7B, 0x06 } };
++
++// COM IDs for system WSL service
+ static const GUID CLSID_LxssUserSession = {
+     0x4F476546,
+     0xB412,
+     0x4579,
+     { 0xB6, 0x4C, 0x12, 0x3D, 0xF3, 0x31, 0xE3, 0xD6 } };
+ 
+-/* Interface identifier */
+ static const GUID IID_ILxssUserSession = {
+     0x536A6BCF,
+     0xFE04,

LICENSE.mintty

@@ -1,4 +1,4 @@
-mintty is copyright 2008-13 Andy Koppe, 2015-18 Thomas Wolff.
+mintty is copyright 2008-22 Andy Koppe, 2015-22 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,6 +11,7 @@ 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`
@@ -35,11 +36,23 @@ You may need to open the Properties of the installer first, tab “General”
 section “Security” (if available) and select “Unblock”, 
 to enable the “Run anyway” button.
 
+#### WSLtty Portable installer
+
+For a portable installation, e.g. on a USB stick, choose the 
+“-install-portable.exe” file for download. Installation will prompt 
+for a portable installation folder interactively. 
+For example, choosing `U:\opt` will create and use folder 
+`U:\opt\wsltty` both as installation directory and configuration directory.
+Portable installation does not install any start menu or desktop shortcuts 
+and no context menu entries. It creates a shortcut in the selected 
+portable installation folder to start the default WSL distribution.
+
 #### Installation from archive ####
 
 In case a local anti-virus guard barfs about the wsltty installer, the 
 release also contains a `.cab` file. Download it, open it, extract its files 
-to some temporary deployment directory, and invoke `install.bat` from there.
+to some temporary deployment directory, and invoke `install.bat` from there, 
+or `install-portable.bat` for a portable installation.
 
 #### Installation from source repository ####
 
@@ -51,7 +64,7 @@ Note this has to be done within a Cygwin environment. A minimal Cygwin
 environment for this purpose would be installed with the 
 [Cygwin installer](https://cygwin.com/setup-x86_64.exe) 
 from [cygwin.com](https://cygwin.com/), 
-with additional packages `make`, `gcc-g++ 9.3.0`, `unzip`, `zoo`.
+with additional packages `make`, `gcc-g++`, `unzip`, `zoo`, `patch`, (`lcab`).
 
 #### Installation to non-default locations ####
 
@@ -62,19 +75,28 @@ the optional second parameter designates the configuration directory.
 
 ### Installation with other package management environments ###
 
-Note that these are 3rd-party contributions and do not necessarily 
-provide the latest version.
+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
+* `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
-<img height=222 align=right src=https://github.com/mintty/wsltty.appx/raw/master/wsltty.appx.png>
 * `choco install wsltty`
 * `choco upgrade wsltty`
 
 #### Scoop ####
 
+([Check package](https://scoop.sh/#/apps?q=wsltty))
 If you use the [Scoop package manager](https://scoop.sh/), 
 * `scoop bucket add extras`
 
@@ -82,10 +104,6 @@ then, invoke one of
 * `scoop install wsltty`
 * `scoop update wsltty`
 
-#### Windows Appx package ####
-
-A Windows Appx package and certificate is available in the [wsltty.appx](https://github.com/mintty/wsltty.appx/) repository.
-
 ### Uninstallation ###
 
 To uninstall wsltty desktop, start menu, and context menu integration:
@@ -99,7 +117,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 
@@ -160,7 +178,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` ####
@@ -227,6 +245,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.4.4
+3.6.5

appveyor.yml

@@ -0,0 +1,31 @@
+# This file is part of wsltty project
+
+# Build image; of course wsltty has nothing to do with Visual Studio -
+# this is just the name of Appveyor's build environment image
+# that also contains cygwin
+image: Visual Studio 2022
+
+# Version format
+version: "#{build}"
+
+# Do not increment build number after pull requests
+pull_requests:
+  do_not_increment_build_number: true
+
+# Do not start a new build when a new Git tag is created
+skip_tags: true
+
+init:
+- cmd: |
+    set PATH=C:\cygwin64;C:\cygwin64\bin;%windir%\System32
+    setup-x86_64 -q -P unzip -P zoo -P patch -P lcab
+    winget install Alpine
+
+build_script:
+- cmd: |
+    make
+
+test_script:
+- cmd: |
+    bin\mintty.exe --log mintty.log --exec echo hello mintty
+    grep echo mintty.log

config-distros.sh

@@ -291,6 +291,15 @@ config () {
   echoc "- root $root"
   wdir=%USERPROFILE%
 
+  case "$name" in
+  docker*)	echo skipping docker system
+  		return;;
+  esac
+  case "$root" in
+  *\\Docker*)	echo skipping docker system
+  		return;;
+  esac
+
   if $ok && ! $remove && [ -n "$distro" ]
   then	# fix #163: backend missing +x with certain mount options
 	echo Setting +x wslbridge2 backends for distro "'$distro'"

install-portable.bat

@@ -0,0 +1,27 @@
+@echo off
+
+set sel="Select folder to place installation of portable wsltty"
+
+for /f "usebackq delims=" %%f in (`powershell "(new-object -COM Shell.Application).BrowseForFolder(0, '%sel%', 0, 0).self.path"`) do set f=%%f
+set instdir=%f%\wsltty
+
+if "%f%"=="" (
+	echo no installation
+	exit
+) else if not exist "%f%" (
+	echo invalid installation folder %instdir%
+	exit
+)
+
+call install "%instdir%" "%instdir%" /P
+
+rem create shortcut
+cd /D "%instdir%"
+set instpath=%instdir:~2%
+set target=%%COMSPEC%%
+set minttyargs=/C bin\mintty.exe --WSL= --icon=/wsl.ico --configdir=. -~
+set bridgeargs= -
+set wdir=%instpath%
+set icon=%instpath%\wsl.ico
+cscript /nologo mkshortcut.vbs "/name:WSL Terminal Portable"
+

install.bat

@@ -1,9 +1,9 @@
 @echo off
 
 set refinstalldir=%%LOCALAPPDATA%%\wsltty
-set installdir="%LOCALAPPDATA%\wsltty"
 set refconfigdir=%%APPDATA%%\wsltty
-set configdir="%APPDATA%\wsltty"
+if "%installdir%" == "" set installdir="%LOCALAPPDATA%\wsltty"
+if "%configdir%" == "" set configdir="%APPDATA%\wsltty"
 call dequote installdir
 call dequote configdir
 set oldroot="%installdir%"
@@ -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,17 +134,25 @@ 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 not exist "%configdir%\config" echo # To use common configuration in %%APPDATA%%\mintty, simply remove this file>"%configdir%\config"
+if exist "%configdir%\config" goto appconfig
+echo # To use common configuration in %%APPDATA%%\mintty, simply remove this file>"%configdir%\config"
+if "%3" == "/P" echo # Do not remove this file for WSLtty Portable>>"%configdir%\config"
 
 
 :appconfig
 
+rem skip configuration for WSLtty Portable
+if "%3" == "/P" goto end
+
 rem distro-specific stuff: shortcuts and launch scripts
 cd /D "%installdir%"
 echo Configuring for WSL distributions

makefile

@@ -10,16 +10,16 @@
 
 
 # wsltty release
-ver=3.4.4
+ver=3.6.5
 
 # wsltty appx release - must have 4 parts!
-verx=3.4.4.0
+verx=3.6.5.1
 
 
 ##############################
 # mintty release version
 
-minttyver=3.4.4
+minttyver=3.6.5
 
 ##############################
 
@@ -27,7 +27,7 @@ minttyver=3.4.4
 repo=Biswa96/wslbridge2
 
 # wslbridge2 master release version
-wslbridgever=0.6
+wslbridgever=0.11
 
 # wslbridge2 latest version
 #archive=master
@@ -148,8 +148,12 @@ $(wslbridgedir).zip:
 wslbridge-source:	$(wslbridgedir).zip
 	unzip -o $(wslbridgedir).zip
 	cp $(wslbridgedir)/LICENSE LICENSE.wslbridge2
-	# patch
-	cd $(wslbridgedir); patch -p1 < ../0001-notify-size-change-inband.patch
+	# 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
+	# patch to https://github.com/Biswa96/wslbridge2/commit/41575379b416703c49e2687e957440239a4cdfb7
+	#cd $(wslbridgedir); patch -p0 < ../0002-add-com-for-lifted-wsl.patch
 
 wslbridge-frontend:	wslbridge-source
 	echo ------------- Compiling wslbridge2 frontend
@@ -185,6 +189,7 @@ appxversion=VERSION_SUFFIX="– wsltty appx $(verx)" WSLTTY_VERSION="$(verx)"
 mintty-build:
 	# ensure rebuild of version-specific check and message
 	rm -f mintty-$(minttyver)/bin/*/windialog.o
+	rm -f mintty-$(minttyver)/bin/*/winmain.o
 	# build mintty
 	cd mintty-$(minttyver)/src; make $(wslbuild) $(wslversion)
 	mkdir -p bin
@@ -211,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/
@@ -219,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
@@ -271,19 +277,41 @@ 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
 	cp -fl $(CAB)/* rel/
 
-installer:	cop
+installer:	cop cab normal-installer silent-installer portable-installer
+
+cab:
+	# build cab archive
+	lcab -r $(CAB) rel/$(CAB).cab
+
+normal-installer:
 	# prepare build of installer
-	rm -f rel/wsltty-$(ver)-install-$(arch).exe
+	rm -f rel/$(CAB)-install.exe
 	sed -e "s,%version%,$(ver)," -e "s,%arch%,$(arch)," makewinx.cfg > rel/wsltty.SED
 	# build installer
 	cd rel; iexpress /n wsltty.SED
-	# build cab archive
-	lcab -r $(CAB) rel/$(CAB).cab
+
+silent-installer:
+	# prepare build of installer
+	rm -f rel/$(CAB)-install-quiet.exe
+	cd rel; sed -e "/ShowInstallProgramWindow/ s/0/1/" -e "/HideExtractAnimation/ s/0/1/" -e "/InstallPrompt/ s/=.*/=/" -e "/FinishMessage/ s/=.*/=/" -e "/TargetName/ s/install.exe/install-quiet.exe/" wsltty.SED > wsltty-quiet.SED
+	# build installer
+	cd rel; iexpress /n wsltty-quiet.SED
+
+InstallPrompt=Install Mintty terminal for WSL Portable?
+FinishMessage=Mintty for WSL Portable installation finished
+
+portable-installer:
+	# prepare build of installer
+	rm -f rel/$(CAB)-install-portable.exe
+	cd rel; sed -e "/InstallPrompt/ s/=.*/=$(InstallPrompt)/" -e "/FinishMessage/ s/=.*/=$(FinishMessage)/" -e "/AppLaunched/ s/install/install-portable/" -e "/TargetName/ s/install.exe/install-portable.exe/" wsltty.SED > wsltty-portable.SED
+	# build installer
+	cd rel; iexpress /n wsltty-portable.SED
 
 install:	cop installbat
 

makewinx.cfg

@@ -26,7 +26,7 @@ SourceFiles=SourceFiles
 InstallPrompt=Install Mintty terminal for WSL (Windows Subsystem for Linux)?
 DisplayLicense=
 FinishMessage=Mintty for WSL installed - for documentation and configuration see https://github.com/mintty/wsltty
-TargetName=wsltty-%version%-install-%arch%.exe
+TargetName=wsltty-%version%-%arch%-install.exe
 FriendlyName=wsltty
 AppLaunched=cmd.exe /c install.bat
 PostInstallCmd=<None>
@@ -60,6 +60,9 @@ FILE24="mintty.ico"
 FILE25="mkshortcut.vbs"
 FILE26="dequote.bat"
 FILE27="cmd2.bat"
+FILE28="install-portable.bat"
+FILE29="getemojis"
+FILE30="getflags"
 
 [SourceFiles]
 SourceFiles0=.
@@ -93,4 +96,7 @@ SourceFiles0=.
 %FILE25%=
 %FILE26%=
 %FILE27%=
+%FILE28%=
+%FILE29%=
+%FILE30%=