3.6.0

as a patch: add COM instance for new lifted WSL service

0001-notify-size-change-inband.patch

@@ -0,0 +1,226 @@
+diff --git a/src/wslbridge2-backend.cpp b/src/wslbridge2-backend.cpp
+index 8b86cc6..63a19e5 100644
+--- a/src/wslbridge2-backend.cpp
++++ b/src/wslbridge2-backend.cpp
+@@ -17,6 +17,7 @@
+ #include <sys/wait.h>
+ #include <unistd.h>
+ #include <wordexp.h>
++#include <limits.h> // PIPE_BUF
+ 
+ #include <string>
+ #include <vector>
+@@ -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 */
++        assert(sizeof data <= PIPE_BUF);
+ 
+         do
+         {
+@@ -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;
++                while (writeRet > 0 && len > 0)
++                {
++                    if (!*s)
++                    {
++                        // dispatch NUL escaped inband information
++                        s++;
++                        len--;
++
++                        if (len < 9 && s + 9 >= data + sizeof data)
++                        {
++                            // make room for additional loading
++                            memcpy(data, s, len);
++                            s = data;
++                        }
++
++                        // ensure 1 more byte is loaded to dispatch on
++                        if (!len)
++                        {
++                            readRet = recv(ioSockets.inputSock, s, 1, 0);
++                            if (readRet > 0)
++                            {
++                                len += readRet;
++                            }
++                            else
++                            {
++                                writeRet = -1;
++                                break;
++                            }
++                        }
++                        if (*s == 2)
++                        {
++                            // STX: escaped NUL
++                            s++;
++                            len--;
++                            writeRet = write(mfd_dp, "", 1);
++                        }
++                        else if (*s == 16)
++                        {
++                            // DLE: terminal window size change
++                            s++;
++                            len--;
++                            // ensure 8 more bytes are loaded for winsize
++                            while (readRet > 0 && len < 8)
++                            {
++                                readRet = recv(ioSockets.inputSock, s + len, 8 - len, 0);
++                                if (readRet > 0)
++                                {
++                                    len += readRet;
++                                }
++                            }
++                            if (readRet <= 0)
++                            {
++                                writeRet = -1;
++                                break;
++                            }
++                            struct winsize * winsp = (struct winsize *)s;
++                            s += 8;
++                            len -= 8;
++                            winsp->ws_xpixel = 0;
++                            winsp->ws_ypixel = 0;
++                            ret = ioctl(mfd, TIOCSWINSZ, winsp);
++                            if (ret != 0)
++                                perror("ioctl(TIOCSWINSZ)");
++                        }
++                    }
++                    else
++                    {
++                        int n = strnlen(s, len);
++                        writeRet = write(mfd_dp, s, n);
++                        if (writeRet > 0)
++                        {
++                            s += writeRet;
++                            len -= writeRet;
++                        }
++                    }
++                }
+             }
+ 
+             /* Resize window when buffer received in control socket */
+diff --git a/src/wslbridge2.cpp b/src/wslbridge2.cpp
+index 300ad57..3ba9096 100644
+--- a/src/wslbridge2.cpp
++++ b/src/wslbridge2.cpp
+@@ -43,19 +43,41 @@ union IoSockets
+ /* global variable */
+ static volatile union IoSockets g_ioSockets = { 0 };
+ 
++#define dont_debug_inband
++#define dont_use_controlsocket
++
+ static void resize_window(int signum)
+ {
++#ifdef use_controlsocket
++#warning this may crash for unknown reason, maybe terminate the backend
+     struct winsize winp;
++    ioctl(STDIN_FILENO, TIOCGWINSZ, &winp);
+ 
+     /* Send terminal window size to control socket */
+-    ioctl(STDIN_FILENO, TIOCGWINSZ, &winp);
+     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];
++    ioctl(STDIN_FILENO, TIOCGWINSZ, winsp);
++
++#ifdef debug_inband
++    /* Send terminal window size inband, visualized as ESC sequence */
++    char resizesc[55];
++    //sprintf(resizesc, "\e_8;%u;%u\a", winsp->ws_row, winsp->ws_col);
++    sprintf(resizesc, "^[_8;%u;%u^G", winsp->ws_row, winsp->ws_col);
++    send(g_ioSockets.inputSock, resizesc, strlen(resizesc), 0);
++#else
++    /* Send terminal window size inband, with NUL escape */
++    send(g_ioSockets.inputSock, wins, sizeof wins, 0);
++#endif
++#endif
+ }
+ 
+ static void* send_buffer(void *param)
+ {
+     int ret;
+     char data[1024];
++    assert(sizeof data <= PIPE_BUF);
+ 
+     while (1)
+     {
+@@ -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)
++            {
++                if (!*s)
++                {
++                    // send NUL STX
++#ifdef debug_inband
++                    ret = send(g_ioSockets.inputSock, (void*)"nul", 3, 0);
++#else
++                    static char NUL_STX[] = {0, 2};
++                    ret = send(g_ioSockets.inputSock, NUL_STX, 2, 0);
++#endif
++                    s++;
++                    len--;
++                }
++                else
++                {
++                    int n = strnlen(s, len);
++                    ret = send(g_ioSockets.inputSock, s, n, 0);
++                    if (ret > 0)
++                    {
++                        s += ret;
++                        len -= ret;
++                    }
++                }
++            }
+     }
+ 
+     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);
+@@ -502,6 +539,17 @@ int main(int argc, char *argv[])
+ 
+     termState.enterRawMode();
+ 
++    /* Create thread to send window size through control socket */
++    struct sigaction act = {};
++    act.sa_handler = resize_window;
++    act.sa_flags = SA_RESTART;
++    ret = sigaction(SIGWINCH, &act, NULL);
++    assert(ret == 0);
++
++    /* Notify initial size in case it's changed since starting */
++    //resize_window(0);
++    kill(getpid(), SIGWINCH);
++
+     /*
+      * wsltty#254: WORKAROUND: Terminates input thread forcefully
+      * when output thread exits. Need some inter-thread syncing.

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-13 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.

LICENSE.wslbridge

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Ryan Prichard
-Copyright (c) 2017-2018 Google LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.

LICENSE.wslbridge2

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -17,6 +17,12 @@ WSLtty components
 
 ---
 
+### Requirement ###
+
+Since release 3.0.5, WSLtty requires Windows version 1809 (the November 2018 release).
+
+---
+
 ### Installation from this repository ###
 
 #### WSLtty installer ([Download](https://github.com/mintty/wsltty/releases) standalone installation) ####
@@ -29,11 +35,35 @@ 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, 
+or `install-portable.bat` for a portable installation.
+
 #### Installation from source repository ####
 
-Download or checkout the wsltty repository.
+Checkout the wsltty repository, or download the source archive, unpack and rename the directory to `wsltty`.
-Invoke `make`, then `make install`.
+Install Alpine WSL from the Microsoft Store.
-Note this has to be done within a Cygwin environment.
+Invoke `make build`, then `make install`.
+
+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++`, `unzip`, `zoo`, `patch`, (`lcab`).
 
 #### Installation to non-default locations ####
 
@@ -44,11 +74,20 @@ the optional second parameter designates the configuration directory.
 
 ### Installation with other package management environments ###
 
+Note: These are 3rd-party packages, not managed by this repository.
+
+#### Windows Package Manager ####
+
+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 ####
 
 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`
 
@@ -61,11 +100,12 @@ then, invoke one of
 * `scoop install wsltty`
 * `scoop update wsltty`
 
-#### Windows Appx package ####
+### Uninstallation ###
 
-A Windows Appx package and certificate is available in the [wsltty.appx](https://github.com/mintty/wsltty.appx/) repository.
+To uninstall wsltty desktop, start menu, and context menu integration:
-
+Open a Windows `cmd`, go into the wsltty installation folder:
-<br clear=all>
+`cd %LOCALAPPDATA%\wsltty` and run the `uninstall` script.
+To uninstall wsltty software completely, remove the installation folder manually.
 
 ---
 
@@ -79,12 +119,37 @@ WSLtty can be invoked with
 Starting the mintty terminal directly from the WSLtty installation location 
 is discouraged because that would bypass essential options.
 
-#### WSL 2 ####
+#### WSL V2 ####
 
-Due to some incompatible changes by Microsoft, wslbridge cannot connect 
+Terminal communication with WSL via its modes V1 or V2 is handled 
-in WSL 2 mode at this time.
+automatically by wsltty (mintty and the wslbridge2 gateway).
-Workaround:
+
-* `wsl --set-default-version 1`
+#### Starting issues ####
+
+If wsltty fails with an 
+`Error: Could not fork child process: Resource temporarily unavailable`...,
+its runtime may be affected by some over-ambitious virus defense strategy.
+For example, with Windows Defender, option “Force randomization for images” 
+should be disabled.
+
+If wsltty fails with an error message that mentions a disk mount path (e.g. `/mnt/c`),
+workarounds may be the shutdown of the WSL V2 virtual machine (`wsl --shutdown` on the distro) 
+or turning off “fast startup” in the Windows power settings (#246, #248).
+
+#### WSL shell starting issues ####
+
+With WSL V2, an additional background shell is run which may cause trouble 
+for example when setting up automatic interaction between Windows side and 
+WSL side 
+(see https://github.com/mintty/wsltty/issues/197#issuecomment-687030527).
+As a workaround, the following may be added to (the beginning of) the 
+WSL shell initialization script `.bashrc` (adapt for other shells):
+```
+    # work around https://github.com/mintty/wsltty/issues/197
+    if [[ -n "$WSL_DISTRO_NAME" ]]; then
+      command -v cmd.exe > /dev/null || exit
+    fi
+```
 
 ---
 
@@ -93,15 +158,15 @@ Workaround:
 #### Start Menu and Desktop shortcuts ####
 
 In the Start Menu, the following shortcuts are installed:
-* For each installed WSL distribution D, D` Terminal` to start in the WSL user home
+* Shortcut <img align=absmiddle height=40 src=tux1.png>`WSL Terminal` to start the default WSL distribution (as configured with the Windows tool `wslconfig` or `wsl -s`)
-* `WSL Terminal` to start the default WSL distribution (as configured with the Windows tool `wslconfig`)
+* For each installed WSL distribution, for example `Ubuntu`, a shortcut like <img align=absmiddle height=40 src=ubuntu1.png>`Ubuntu Terminal` to start in the WSL user home
 
-In the Start Menu subfolder WSLtty, the following shortcuts are installed:
+In the Start Menu subfolder WSLtty, the following additional shortcuts are installed:
-* For each installed WSL distribution D, D` Terminal %` to start in the Windows %USERPROFILE% home
+* Shortcut <img align=absmiddle height=40 src=tux1.png>`WSL Terminal %` to start the default WSL distribution in the Windows %USERPROFILE% home
-* `WSL Terminal %` to start the default WSL distribution in the Windows %USERPROFILE% home
+* For each installed WSL distribution, for example `Ubuntu`, a shortcut like <img align=absmiddle height=40 src=ubuntu1.png>`Ubuntu Terminal %` to start in the Windows %USERPROFILE% home
 
 One Desktop shortcut is installed:
-* `WSL Terminal` to start the default WSL distribution (as configured with the Windows tool `wslconfig`)
+* Shortcut <img align=absmiddle height=40 src=tux1.png>`WSL Terminal` to start the default WSL distribution (as configured with the Windows tool `wslconfig` or `wsl -s`)
 
 Other, distribution-specific shortcuts can be copied to the desktop 
 from the Start Menu if desired.
@@ -117,8 +182,8 @@ in order to create the respective set of shortcuts in the Start menu.
 WSLtty installs the following scripts into `%LOCALAPPDATA%\Microsoft\WindowsApps` 
 (and a copy in its application folder `%LOCALAPPDATA%\wsltty`):
 
-* For each installed WSL distribution D, D`.bat` to start in the current folder/directory
+* For each installed WSL distribution, e.g. Ubuntu, a command script like `Ubuntu.bat` to start in the current folder/directory
-* For each installed WSL distribution D, D`~.bat` to start in the WSL user home
+* 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
 
 Given that `%LOCALAPPDATA%\Microsoft\WindowsApps` is in your PATH,
@@ -154,14 +219,15 @@ Mintty can maintain its configuration file in various locations,
 with the following precedence:
 * file given with mintty option `-c` (not used by wsltty default installation)
 * file `config` in directory given with mintty option `--configdir`
-  * This is `%APPDATA%\wsltty\config` in the default wsltty installation.
+  * **`%APPDATA%\wsltty\config`** in the default wsltty installation
 * `%HOME%\.minttyrc` (usage deprecated with wsltty)
 * `%HOME%\.config\mintty\config` (usage deprecated with wsltty)
-* `%APPDATA%\mintty\config`
+* common config file for all mintty installation instances
+  * **`%APPDATA%\mintty\config`**
 * `%LOCALAPPDATA%\wsltty\etc\minttyrc` (usage deprecated with wsltty)
 
 Note:
-* `%APPDATA%\wsltty\config` is the new user configuration file location. 
+* `%APPDATA%\wsltty\config` is the user configuration file location. 
   Further subdirectories of `%APPDATA%\wsltty` are used for language, 
   themes, and sounds resource configuration. 
   Note the distinction from `%LOCALAPPDATA%\wsltty` which is the default 
@@ -173,21 +239,42 @@ Note:
   root directory of the cygwin standalone installation hosting wsltty. 
   So `%HOME%` would mean `%LOCALAPPDATA%\wsltty\home\%USERNAME%`.
   If you define `HOME` at Windows level, this changes accordingly.
-  Note, however, that the WSL `HOME` is a completely different setting.
+  Note, however, that the WSL `$HOME` is a completely different setting.
 
 #### Shell selection and Login shell ####
 
-The WSLtty deployment does not impose a shell preference anymore.
+The WSLtty deployment does not impose a shell preference;
-However, the intermediate gateways (`wslbridge` and its backend and the `bash.exe` Windows launcher) 
+it invokes the user’s default shell in login mode by the final `-` parameter:
-are also involved.
+* `%LOCALAPPDATA%\wsltty\bin\mintty.exe --WSL= --configdir="%APPDATA%\wsltty" -`
 
-To invoke your favourite shell or launch the shell in login mode, 
+You may tweak shortcuts, scripts, or context menu entries as follows:
-you may append a shell pathname and an optional `-l` parameter 
+
-to the mintty invocation (in shortcuts, scripts, or context menu entries):
+To launch a default shell in non-login mode, remove the final dash.
+
+To invoke your preferred shell, replace the final dash with 
+a shell pathname and an optional `-l` parameter 
 * `%LOCALAPPDATA%\wsltty\bin\mintty.exe --WSL= --configdir="%APPDATA%\wsltty" /bin/bash -l`
 
 ---
 
+### WSL locale setup and character encoding ###
+
+Character encoding setup by locale setting is propagated from the terminal 
+towards WSL. So you can select your favourite locale with configuration 
+options or with command-line options, for example in a copied dedicated 
+desktop shortcut.
+
+If for example you wish to run WSL in GB18030 encoding, you may set options
+`Locale=zh_CN` and `Charset=GB18030` and the WSL shell will adopt that 
+setting, provided that the selected locale is configured to be available 
+in the locale database of the WSL distribution.
+This can be achieved in Ubuntu with the following commands:
+* `sudo mkdir -p /var/lib/locales/supported.d`
+* `sudo echo zh_CN.GB18030 GB18030 >> /var/lib/locales/supported.d/local`
+* `sudo locale-gen`
+
+---
+
 ### Components and Credits ###
 
 For mintty, see the [Mintty homepage](http://mintty.github.io/) 
@@ -199,5 +286,11 @@ 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)).
 
-For interacting with WSL, it uses [wslbridge](https://github.com/rprichard/wslbridge).
+For interacting with WSL, [wslbridge](https://github.com/rprichard/wslbridge)
-Many thanks for this enabling gateway go especially to Ryan Prichard.
+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 
+[wslbridge2](https://github.com/Biswa96/wslbridge2) is used instead.
+Many thanks for this further development and maintenance go to Biswapriyo Nath.
+

VERSION

@@ -1 +1 @@
-3.0.2.3
+3.6.0

cmd2.bat

@@ -0,0 +1 @@
+%1 "%from%" "%to%"

config-distros.sh

@@ -1,15 +1,42 @@
 #! /bin/sh
 
-# set some paths; capital variables are for the mkshortcut.exe case, 
+# dash built-in echo enforces interpretation of \t etc
-# not for the (deprecated) mkshortcut.vbs case
+echoc () {
+  #cmd /c echo $*
+  printf '%s\n' "$*"
+}
+
+copy () {
+  from="$1"
+  to="$2"
+  export from to
+  cmd /c cmd2.bat copy
+}
+
+delete () {
+  from="$1"
+  to="$1"	# same again, to fill parameter
+  export from to
+  cmd /c cmd2.bat del/F
+}
+
+compare () {
+  from="$1"
+  to="$2"
+  export from to
+  cmd /c cmd2.bat comp/M
+}
+
 
 case "$installdir" in
 ?*)	custominst=true;;
 "")	custominst=false;;
 esac
 
-INSTDIR=${installdir:-$LOCALAPPDATA/wsltty}
+INSTDIR="${installdir:-$LOCALAPPDATA/wsltty}"
+echoc "Installing wsltty into $INSTDIR"
 INSTDIR=`cd "$INSTDIR"; pwd`
+installcop=${installdir:-"$LOCALAPPDATA\\wsltty"}
 installdir=${installdir:-'%LOCALAPPDATA%\wsltty'}
 
 target="$installdir"'\bin\mintty.exe'
@@ -18,7 +45,7 @@ case "$INSTDIR" in
 *)	TARGETPATH="$INSTDIR"/bin/mintty.exe;;
 esac
 
-CONFDIR=${configdir:-$APPDATA/wsltty}
+CONFDIR="${configdir:-$APPDATA/wsltty}"
 configdir=${configdir:-'%APPDATA%\wsltty'}
 
 PATH=/bin:"$PATH":$SYSTEMROOT/System32
@@ -37,9 +64,14 @@ case "$1" in
 -info)
   config=false
   shift;;
+-shortcuts)
+  shift;;
 -shortcuts-remove)
   remove=true
   shift;;
+-default)
+  alldistros=false
+  shift;;
 -contextmenu)
   contextmenu=true
   shift;;
@@ -77,6 +109,26 @@ case "$1" in
   shift;;
 esac
 
+
+if $config && ! $contextmenu
+then
+  # remove shortcut entries in Start menu and cmd-line bat shortcuts
+  (cd "$INSTDIR"
+   for lnk in *.lnk
+   do
+     if compare "$lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\$lnk"
+     then delete "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\$lnk"
+     fi
+   done
+   for bat in *.bat
+   do
+     if compare "$bat" "$LOCALAPPDATA\\Microsoft\\WindowsApps\\$bat"
+     then delete "$LOCALAPPDATA\\Microsoft\\WindowsApps\\$bat"
+     fi
+   done
+  )
+fi
+
 # test w/o WSL: call this script with REGTOOLFAKE=true dash config-distros.sh
 if ${REGTOOLFAKE:-false}
 then
@@ -103,10 +155,6 @@ regtool () {
 }
 fi
 
-# dash built-in echo enforces interpretation of \t etc
-echoc () {
-  cmd /c echo $*
-}
 
 if $config
 then while read line; do echo "$line"; done <</EOB > mkbat.bat
@@ -121,14 +169,32 @@ fi
 
 if $custominst && $config && ! $remove
 then
-  mkshortcut.exe -n "add to context menu" -a "$installdir/config-distros.sh -contextmenu" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir"
+  #mkshortcut.exe -n "add to context menu" -a "$installdir/config-distros.sh -contextmenu" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir"
-  mkshortcut.exe -n "add default to context menu" -a "$installdir/config-distros.sh -contextmenu-default" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir"
+  #mkshortcut.exe -n "add default to context menu" -a "$installdir/config-distros.sh -contextmenu-default" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir"
-  mkshortcut.exe -n "remove from context menu" -a "$installdir/config-distros.sh -contextmenu-remove" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir"
+  #mkshortcut.exe -n "remove from context menu" -a "$installdir/config-distros.sh -contextmenu-remove" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir"
-  mkshortcut.exe -n "configure WSL shortcuts" -a "$installdir/config-distros.sh" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir"
+  #mkshortcut.exe -n "configure WSL shortcuts" -a "$installdir/config-distros.sh" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir"
-  cmd /C copy "add to context menu.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+
-  cmd /C copy "add default to context menu.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+  icon='%SystemRoot%\System32\filemgmt.dll'
-  cmd /C copy "remove from context menu.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+  wdir="$installdir"
-  cmd /C copy "configure WSL shortcuts.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+  target="$installdir/bin/dash.exe"
+  minttyargs="/config-distros.sh"
+  bridgeargs=
+  export icon wdir target minttyargs bridgeargs
+  cscript /nologo mkshortcut.vbs "/name:configure WSL shortcuts" "/min:true"
+  bridgeargs=-contextmenu
+  cscript /nologo mkshortcut.vbs "/name:add to context menu" "/min:true"
+  bridgeargs=-contextmenu-default
+  cscript /nologo mkshortcut.vbs "/name:add default to context menu" "/min:true"
+  bridgeargs=-contextmenu-remove
+  cscript /nologo mkshortcut.vbs "/name:remove from context menu" "/min:true"
+
+  copy "add to context menu.lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+  copy "add default to context menu.lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+  copy "remove from context menu.lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+  copy "configure WSL shortcuts.lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+
+  # restore target
+  target="$installdir"'\bin\mintty.exe'
 fi
 
 lxss="/HKEY_CURRENT_USER/Software/Microsoft/Windows/CurrentVersion/Lxss"
@@ -161,114 +227,154 @@ config () {
     case "$distro" in
     Legacy)
     	name="Bash on Windows"
-    	launch=
     	launcher="$SYSTEMROOT/System32/bash.exe"
     	;;
     *)	name="$distro"
-    	launch="$distro"
     	launcher="$LOCALAPPDATA/Microsoft/WindowsApps/$distro.exe"
     	;;
     esac
     basepath=`regtool get "$lxss/$guid/BasePath"`
     if package=`regtool -q get "$lxss/$guid/PackageFamilyName"`
     then
-    	instdir=`regtool get "$schema/$package/Schemas/PackageFullName"`
+    	distrinst=`regtool get "$schema/$package/Schemas/PackageFullName"`
     	# get actual executable path (may not match $distro) from app manifest
-    	manifest="$ProgramW6432/WindowsApps/$instdir/AppxManifest.xml"
+    	manifest="$ProgramW6432/WindowsApps/$distrinst/AppxManifest.xml"
     	psh_cmd='([xml]$(Get-Content '"\"$manifest\""')).Package.Applications.Application.Executable'
     	executable=`appex "$manifest"`
-    	if [ -r "$ProgramW6432/WindowsApps/$instdir/$executable" ]
+    	if [ -r "$ProgramW6432/WindowsApps/$distrinst/$executable" ]
-    	then	icon="%PROGRAMFILES%/WindowsApps/$instdir/$executable"
+    	then	icon="$ProgramW6432/WindowsApps/$distrinst/$executable"
-    	elif [ -r "$ProgramW6432/WindowsApps/$instdir/images/icon.ico" ]
+    	elif [ -r "$ProgramW6432/WindowsApps/$distrinst/images/icon.ico" ]
-    	then	icon="%PROGRAMFILES%/WindowsApps/$instdir/images/icon.ico"
+    	then	icon="$ProgramW6432/WindowsApps/$distrinst/images/icon.ico"
-    	else	icon="$installdir"'\wsl.ico'
+    	else	icon="$installcop"'\wsl.ico'
     	fi
     	root="$basepath/rootfs"
     elif [ -f "$basepath/$distro.exe" ]
     then
     	icon="$basepath/$distro.exe"
     	root="$basepath/rootfs"
-    else
+    elif [ -d "$LOCALAPPDATA/lxss" ]
-    	icon="%LOCALAPPDATA%/lxss/bash.ico"
+    then
+    	# legacy "Bash on Windows"
+    	icon="$LOCALAPPDATA/lxss/bash.ico"
     	root="$basepath"
+    else
+    	# imported distro? (#226, #236)
+    	icon="$installcop"'\wsl.ico'
+    	root="$basepath/rootfs"
     fi
 
-    #minttyargs='--wsl --rootfs="'"$root"'" --configdir="'"$configdir"'" -o Locale=C -o Charset=UTF-8 /bin/wslbridge '
+    # invocation parameters for mintty
     minttyargs='--WSL="'"$distro"'" --configdir="'"$configdir"'"'
+    # MINTARGS deprecated; used for mkshortcut.exe rather than mkshortcut.vbs
     MINTARGS='--WSL="'"$distro"'" --configdir="'"$CONFDIR"'"'
-    #if [ -z "$launch" ]
+    # invocation commands (deprecated for mintty, used for start menu scripts)
-    #then	bridgeargs='-t /bin/bash'
+    #bridgeargs='--distro-guid "'"$guid"'" -t'
-    #else	bridgeargs='-l "'"$launch"'" -t /bin/bash'
-    #fi
-    bridgeargs='--distro-guid "'"$guid"'" -t /bin/bash'
-    bridgeargs='--distro-guid "'"$guid"'" -t'
 
     ok=true;;
   DefaultDistribution|"")	# WSL default installation
     distro=
     name=WSL
-    icon="$installdir"'\wsl.ico'
+    icon="$installcop"'\wsl.ico'
     minttyargs='--WSL= --configdir="'"$configdir"'"'
     MINTARGS='--WSL= --configdir="'"$CONFDIR"'"'
-    bridgeargs='-t'
+    #bridgeargs='-t'
 
     ok=true;;
   esac
+  bridgeargs=" -"	# now used to request login mode
+
   echoc "distro '$distro'"
   echoc "- name '$name'"
   echoc "- guid $guid"
   echoc "- (launcher $launcher)"
   echoc "- icon $icon"
   echoc "- root $root"
-  bridgeargs=" "	# deprecated
+  wdir=%USERPROFILE%
 
-  if $ok && [ -n "$distro" ]
+  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 wslbridge-backend for distro "'$distro'"
+	echo Setting +x wslbridge2 backends for distro "'$distro'"
-	(cd "$INSTDIR"; cd bin; wsl.exe -d "$distro" chmod +x wslbridge-backend)
+	(cd "$INSTDIR"; cd bin; PATH="${WINDIR}/Sysnative:${PATH}" wsl.exe -d "$distro" chmod +x wslbridge2-backend)
-#	(cd "$LOCALAPPDATA/wsltty/bin"; wsl.exe -d "$distro" chmod +x wslbridge-backend)
+#	(cd "$LOCALAPPDATA/wsltty/bin"; wsl.exe -d "$distro" chmod +x wslbridge2-backend)
-#	(cd ... ; "$SYSTEMROOT/System32/bash.exe" "$guid" -c chmod +x wslbridge-backend)
+#	(cd ... ; "$SYSTEMROOT/System32/bash.exe" "$guid" -c chmod +x wslbridge2-backend)
   fi
 
   if $ok && $config
   then
-    export name target minttyargs bridgeargs icon
+    export wdir name target minttyargs bridgeargs icon
 
     if $contextmenu
     then
       # context menu entries
-      #cmd /C mkcontext "$name"
       direckey='HKEY_CURRENT_USER\Software\Classes\Directory'
       keyname="${name}_Terminal"
       if $remove
       then
+        # obsolete; handled above
         reg delete "$direckey\\shell\\$keyname" /f
         reg delete "$direckey\\Background\\shell\\$keyname" /f
       else
-        reg add "$direckey\\shell\\$keyname" /d "$name Terminal" /f
+        direckey='/HKEY_CURRENT_USER/Software/Classes/Directory'
-        reg add "$direckey\\shell\\$keyname" /v Icon /d "$icon" /f
+        echoc Registry setting "$direckey/[Background/]shell/$keyname"
-        cmd /C reg add "$direckey\\shell\\$keyname\\command" /d "\"$target\" -i \"$icon\" --dir \"%1\" $minttyargs $bridgeargs" /f
+        target="$installcop"'\bin\mintty.exe'
-        reg add "$direckey\\Background\\shell\\$keyname" /d "$name Terminal" /f
+
-        reg add "$direckey\\Background\\shell\\$keyname" /v Icon /d "$icon" /f
+        regtool add "$direckey/shell"
-        cmd /C reg add "$direckey\\Background\\shell\\$keyname\\command" /d "\"$target\" -i \"$icon\" $minttyargs $bridgeargs" /f
+        regtool add "$direckey/shell/$keyname"
+        regtool set "$direckey/shell/$keyname/" -s "$name Terminal"
+        regtool set "$direckey/shell/$keyname/Icon" -s "$icon"
+        regtool add "$direckey/shell/$keyname/command"
+        regtool set "$direckey/shell/$keyname/command/" -s "\"$target\" -i \"$icon\" --dir \"%1\" $MINTARGS $bridgeargs"
+
+        regtool add "$direckey/Background/shell"
+        regtool add "$direckey/Background/shell/$keyname"
+        regtool set "$direckey/Background/shell/$keyname/" -s "$name Terminal"
+        regtool set "$direckey/Background/shell/$keyname/Icon" -s "$icon"
+        regtool add "$direckey/Background/shell/$keyname/command"
+        regtool set "$direckey/Background/shell/$keyname/command/" -s "\"$target\" -i \"$icon\" $MINTARGS $bridgeargs"
       fi
     else
       # invocation shortcuts and scripts
       if $remove
       then
-        cmd /C del "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\$name Terminal.lnk"
+        delete "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs\\$name Terminal.lnk"
-        cmd /C del "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name.bat"
+        delete "$LOCALAPPDATA\\Microsoft\\WindowsApps\\$name.bat"
-        cmd /C del "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name~.bat"
+        delete "$LOCALAPPDATA\\Microsoft\\WindowsApps\\$name~.bat"
+
+        if [ "$name" = "WSL" ]
+        then
+              # determine actual Desktop folder
+              desktopkey='\HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Desktop'
+              desktop=`regtool get "$desktopkey"`
+              case "$desktop" in
+              %USERPROFILE%*)	desktop="$USERPROFILE${desktop#%USERPROFILE%}";;
+              esac
+              delete "$desktop\\$name Terminal.lnk"
+        fi
       else
         # desktop shortcut in %USERPROFILE% -> Start Menu - WSLtty
-        ##cscript /nologo mkshortcut.vbs "/name:$name Terminal %"
+        cscript /nologo mkshortcut.vbs "/name:$name Terminal %"
-        mkshortcut.exe -n "$name Terminal %" -i "$icon" "$TARGETPATH" -a "$MINTARGS" -d "" -w %USERPROFILE%
+        #mkshortcut.exe -n "$name Terminal %" -i "$icon" "$TARGETPATH" -a "$MINTARGS" -d "" -w %USERPROFILE%
-        cmd /C copy "$name Terminal %.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
+        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 copy "$name.bat" "$installdir"
+        copy "$name.bat" "$LOCALAPPDATA\\Microsoft\\WindowsApps"
-        cmd /C copy "$name.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps"
+
+        # store backup copies in installation dir
+        if [ "$PWD" != "$INSTDIR" ]
+        then
+              copy "$name Terminal %.lnk" "$installcop"
+              copy "$name.bat" "$installcop"
+        fi
 
         # prepare versions to target WSL home directory
         #bridgeargs="-C~ $bridgeargs"
@@ -276,26 +382,35 @@ config () {
         MINTARGS="$MINTARGS -~"
 
         # desktop shortcut in ~ -> Start Menu
-        ##cscript /nologo mkshortcut.vbs "/name:$name Terminal"
+        cscript /nologo mkshortcut.vbs "/name:$name Terminal"
-        mkshortcut.exe -n "$name Terminal" -i "$icon" "$TARGETPATH" -a "$MINTARGS" -d "" -w %USERPROFILE%
+        #mkshortcut.exe -n "$name Terminal" -i "$icon" "$TARGETPATH" -a "$MINTARGS" -d "" -w %USERPROFILE%
-        cmd /C copy "$name Terminal.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs"
+        copy "$name Terminal.lnk" "$APPDATA\\Microsoft\\Windows\\Start Menu\\Programs"
 
         # default desktop shortcut in ~ -> Desktop
         if [ "$name" = "WSL" ]
         then
-              #cmd /C copy "$name Terminal.lnk" "%USERPROFILE%\\Desktop"
+              #copy "$name Terminal.lnk" "$USERPROFILE\\Desktop"
-              #cmd /C copy "$name Terminal.lnk" "%APPDATA%\\..\\Desktop\\"
+              #copy "$name Terminal.lnk" "$APPDATA\\..\\Desktop\\"
               # the above does not work reliably (see #166)
               # determine actual Desktop folder
               desktopkey='\HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Desktop'
               desktop=`regtool get "$desktopkey"`
-              cmd /C copy "$name Terminal.lnk" "$desktop\\"
+              case "$desktop" in
+              %USERPROFILE%*)	desktop="$USERPROFILE${desktop#%USERPROFILE%}";;
+              esac
+              copy "$name Terminal.lnk" "$desktop\\"
         fi
 
         # launch script in ~ -> WSLtty home, WindowsApps launch folder
         cmd /C mkbat.bat "$name~"
-        cmd /C copy "$name~.bat" "$installdir"
+        copy "$name~.bat" "$LOCALAPPDATA\\Microsoft\\WindowsApps"
-        cmd /C copy "$name~.bat" "%LOCALAPPDATA%\\Microsoft\\WindowsApps"
+
+        # store backup copies in installation dir
+        if [ "$PWD" != "$INSTDIR" ]
+        then
+              copy "$name Terminal.lnk" "$installcop"
+              copy "$name~.bat" "$installcop"
+        fi
       fi
 
     fi

dequote.bat

@@ -0,0 +1,3 @@
+@echo off
+rem https://ss64.com/nt/syntax-dequote.html
+for /f "delims=" %%A in ('echo %%%1%%') do set %1=%%~A

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,26 +1,31 @@
 @echo off
 
 set refinstalldir=%%LOCALAPPDATA%%\wsltty
-set installdir=%LOCALAPPDATA%\wsltty
 set refconfigdir=%%APPDATA%%\wsltty
-set configdir=%APPDATA%\wsltty
+if "%installdir%" == "" set installdir="%LOCALAPPDATA%\wsltty"
-set oldroot=%installdir%
+if "%configdir%" == "" set configdir="%APPDATA%\wsltty"
-set oldhomedir=%installdir%\home\%USERNAME%
+call dequote installdir
-set oldconfigdir=%oldhomedir%\.config\mintty
+call dequote configdir
+set oldroot="%installdir%"
+set oldhomedir="%installdir%\home\%USERNAME%"
+call dequote oldroot
+call dequote oldhomedir
+set oldconfigdir="%oldhomedir%\.config\mintty"
+call dequote oldconfigdir
 if not "%1" == "" set refinstalldir=%1 && set installdir=%1
 if not "%2" == "" set refconfigdir=%2 && set configdir=%2
 
 
 :deploy
 
-mkdir "%installdir%"
+mkdir "%installdir%" 2> nul:
 
 rem clean up previous installation artefacts
 del /Q "%installdir%\*.bat"
 del /Q "%installdir%\*.lnk"
 
 copy LICENSE.mintty "%installdir%"
-copy LICENSE.wslbridge "%installdir%"
+copy LICENSE.wslbridge2 "%installdir%"
 
 copy "add to context menu.lnk" "%installdir%"
 copy "add default to context menu.lnk" "%installdir%"
@@ -30,7 +35,9 @@ rem copy "WSL Terminal.lnk" "%installdir%"
 rem copy "WSL Terminal %%.lnk" "%installdir%"
 copy config-distros.sh "%installdir%"
 
-rem copy mkshortcut.vbs "%installdir%"
+copy mkshortcut.vbs "%installdir%"
+copy cmd2.bat "%installdir%"
+copy dequote.bat "%installdir%"
 
 rem allow persistent customization of default icon:
 if not exist "%installdir%\wsl.ico" copy tux.ico "%installdir%\wsl.ico"
@@ -39,48 +46,49 @@ copy uninstall.bat "%installdir%"
 
 if not exist "%installdir%\bin" goto instbin
 rem move previous programs possibly in use out of the way
-del /Q "%installdir%\bin\*.old"
+del /Q "%installdir%\bin\*.old" 2> nul:
 ren "%installdir%\bin\cygwin1.dll" cygwin1.dll.old
 ren "%installdir%\bin\cygwin-console-helper.exe" cygwin-console-helper.exe.old
 ren "%installdir%\bin\mintty.exe" mintty.exe.old
-ren "%installdir%\bin\wslbridge.exe" wslbridge.exe.old
+ren "%installdir%\bin\wslbridge2.exe" wslbridge2.exe.old
-ren "%installdir%\bin\wslbridge-backend" wslbridge-backend.old
+ren "%installdir%\bin\wslbridge2-backend" wslbridge2-backend.old
-del /Q "%installdir%\bin\*.old"
+del /Q "%installdir%\bin\*.old" 2> nul:
 
 :instbin
-mkdir "%installdir%\bin"
+mkdir "%installdir%\bin" 2> nul:
 copy cygwin1.dll "%installdir%\bin"
 copy cygwin-console-helper.exe "%installdir%\bin"
 copy mintty.exe "%installdir%\bin"
-copy wslbridge.exe "%installdir%\bin"
+copy wslbridge2.exe "%installdir%\bin"
-copy wslbridge-backend "%installdir%\bin"
+copy wslbridge2-backend "%installdir%\bin"
 
 copy dash.exe "%installdir%\bin"
 copy regtool.exe "%installdir%\bin"
 copy zoo.exe "%installdir%\bin"
 
-copy mkshortcut.exe "%installdir%"\bin
+rem copy mkshortcut.exe "%installdir%"\bin
-copy cygpopt-0.dll "%installdir%"\bin
+rem copy cygpopt-0.dll "%installdir%"\bin
-copy cygiconv-2.dll "%installdir%"\bin
+rem copy cygiconv-2.dll "%installdir%"\bin
-copy cygintl-8.dll "%installdir%"\bin
+rem copy cygintl-8.dll "%installdir%"\bin
 
 rem create system config directory and copy config archive
-mkdir "%installdir%\usr\share\mintty\lang"
+mkdir "%installdir%\usr\share\mintty\lang" 2> nul:
 copy lang.zoo "%installdir%\usr\share\mintty\lang"
-mkdir "%installdir%\usr\share\mintty\themes"
+mkdir "%installdir%\usr\share\mintty\themes" 2> nul:
 copy themes.zoo "%installdir%\usr\share\mintty\themes"
-mkdir "%installdir%\usr\share\mintty\sounds"
+mkdir "%installdir%\usr\share\mintty\sounds" 2> nul:
 copy sounds.zoo "%installdir%\usr\share\mintty\sounds"
-mkdir "%installdir%\usr\share\mintty\info"
+mkdir "%installdir%\usr\share\mintty\info" 2> nul:
 copy charnames.txt "%installdir%\usr\share\mintty\info"
-mkdir "%installdir%\usr\share\mintty\icon"
+mkdir "%installdir%\usr\share\mintty\icon" 2> nul:
 copy tux.ico "%installdir%\usr\share\mintty\icon"
 copy mintty.ico "%installdir%\usr\share\mintty\icon"
 
 
 rem create Start Menu Folder
-set smf=%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty
+set smf="%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty"
-mkdir "%smf%"
+call dequote smf
+mkdir "%smf%" 2> nul:
 
 rem clean up previous installation
 del /Q "%smf%\*.lnk"
@@ -93,7 +101,7 @@ copy "configure WSL shortcuts.lnk" "%smf%"
 rem copy "WSL Terminal.lnk" "%smf%"
 rem copy "WSL Terminal %%.lnk" "%smf%"
 rem clean up previous installation
-rmdir /S /Q "%smf%\context menu shortcuts"
+rmdir /S /Q "%smf%\context menu shortcuts" 2> nul:
 
 rem unpack config files in system config directory
 cd /D "%installdir%\usr\share\mintty\lang"
@@ -102,6 +110,7 @@ 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%"
 
 
 :migrate configuration
@@ -116,24 +125,33 @@ rmdir "%oldhomedir%\.config"
 if exist "%configdir%\config" goto deloldhome
 if exist "%oldhomedir%\.minttyrc" copy "%oldhomedir%\.minttyrc" "%configdir%\config" && del "%oldhomedir%\.minttyrc"
 :deloldhome
-rmdir "%oldhomedir%"
+rmdir "%oldhomedir%" 2> nul:
-rmdir "%oldroot%\home"
+rmdir "%oldroot%\home" 2> nul:
 
 
 :userconfig
 
 rem create user config directory and subfolders
-mkdir "%configdir%\lang"
+mkdir "%configdir%\lang" 2> nul:
-mkdir "%configdir%\themes"
+mkdir "%configdir%\themes" 2> nul:
-mkdir "%configdir%\sounds"
+mkdir "%configdir%\sounds" 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 "%installdir%"
+cd /D "%installdir%"
-bin\dash.exe "%installdir%\config-distros.sh"
+echo Configuring for WSL distributions
-rem bin\dash.exe "%installdir%\config-distros.sh" -contextmenu
+bin\dash.exe "config-distros.sh"
+rem rem bin\dash.exe "config-distros.sh" -contextmenu
 
 
 :end

makefile

@@ -4,52 +4,69 @@
 # make targets:
 # make [all]	build a distributable installer (default)
 # make pkg	build an installer, bypassing the system checks
+# make build	build the software (no installer)
+# make install	install wsltty locally from build (no installer needed)
 # make wsltty	build the software, using the local copy of mintty
 
 
 # wsltty release
-ver=3.0.2.3
+ver=3.6.0
 
 # wsltty appx release - must have 4 parts!
-verx=3.0.2.3
+verx=3.6.0.0
 
-# Windows SDK version for appx
-WINSDKKEY=/HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/.NET Framework Platform/Setup/Multi-Targeting Pack
-WINSDKVER=`regtool list '$(WINSDKKEY)' | sed -e '$$ q' -e d`
 
 ##############################
 # mintty release version
-minttyver=3.0.2
 
-# or mintty branch or commit version
+minttyver=3.6.0
-#minttyver=master
 
 ##############################
-# wslbridge binary package; may be overridden below
-wslbridge=wslbridge-package
-wslbridgever=0.2.4
 
-# or wslbridge branch or commit to build from source;
+# wslbridge2 repository
-# also set wslbridge-commit
+repo=Biswa96/wslbridge2
+
+# wslbridge2 master release version
+wslbridgever=0.8
+
+# wslbridge2 latest version
+#archive=master
+#wslbridgedir=wslbridge2-$(archive)
+
+# wslbridge2 branch or commit version (from fix-window-resize branch) and dir
+#commit=70e0dcea1db122d076ce1578f2a45280cc92d09f
+#commit=8b6dd7ee2b3102d72248990c21764c5cf86c6612
+#archive=$(commit)
+#wslbridgedir=wslbridge2-$(archive)
+
+
+# wslbridge2 fork repository and version
+#repo=mintty/wslbridge2
+#wslbridgever=0.5.1
+
+
+# wslbridge2 release or fork archive and dir
+archive=v$(wslbridgever)
+wslbridgedir=wslbridge2-$(wslbridgever)
+
+
+##############################
+
+# mintty branch or commit version
+#minttyver=master
+
+# wslbridge branch or commit to build from source;
 wslbridge=wslbridge-frontend wslbridge-backend
 
-# release 0.2.0 does not have cygwin_internal(CW_SYNC_WINENV) yet:
+##############################
-#wslbridge-commit=master
+# build backend on a musl-libc-based distribution
+# (reportedly not needed anymore but untested)
+BuildDistr=-d Alpine
 
-# use --distro-guid option (merged into 0.2.4):
+##############################
-#wslbridge-commit=cb22e3f6f989cefe5b6599d3c04422ded74db664
+# Windows SDK version for appx
-
+WINSDKKEY=/HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/.NET Framework Platform/Setup/Multi-Targeting Pack
-# after 0.2.4, from branch login-mode:
+WINSDKVER=`regtool list '$(WINSDKKEY)' | sed -e '$$ q' -e d`
-wslbridge-commit=04a060505860915c99bc336dbeb80269771a80b7
-
-# after 0.2.4, from branch wslpath:
-wslbridge-commit=29df86d87135caec8424c08f031ce121a3a39ae1
-
-# after 0.2.4, merged wslpath branch:
-wslbridge-commit=06fb7acba28d7f37611f3911685af214739895a0
-
-# after 0.2.4, with --backend option:
-wslbridge-commit=47b41bec6c32da58ab01de9345087b1a4fd836e3
 
 #############################################################################
 # default target
@@ -85,14 +102,20 @@ wgeto=curl -R -L --connect-timeout 55
 # - ensure the path name drag-and-drop adaptation works (-> Cygwin, not MSYS)
 # - 64 Bit (x86_64) for more stable invocation (avoid fork issues)
 
-check:
+arch:=$(shell uname -m)
+
+check:	# checkarch
+	echo Building for:
+	echo $(arch) | grep .
 	# checking suitable host environment; run `make pkg` to bypass
 	# check cygwin (vs msys) for proper drag-and-drop paths:
 	uname | grep CYGWIN
+
+checkarch:
 	# check 32 bit to ensure 32-Bit Windows support, just in case:
 	#uname -m | grep i686
 	# check 64 bit to provide 64-Bit stability support:
-	uname -m | grep x86_64
+	#uname -m | grep x86_64
 
 #############################################################################
 # patch version information for appx package configuration
@@ -107,43 +130,49 @@ fix-verx:
 	sed -i~ -e '/<Identity / s,Version="[.0-9]*",Version="$(verx)",' AppxManifest.xml
 	echo patched AppxManifest.xml
 
+#############################################################################
+# clear binaries
+
+clean:
+	rm -fr $(wslbridgedir)/bin
+	rm -fr bin
+
 #############################################################################
 # generation
 
 wslbridge:	$(wslbridge)
 
-wslbridge-package:
+$(wslbridgedir).zip:
-	$(wget) https://github.com/rprichard/wslbridge/releases/download/$(wslbridgever)/wslbridge-$(wslbridgever)-$(sys).tar.gz
+	$(wgeto) https://github.com/$(repo)/archive/$(archive).zip -o $(wslbridgedir).zip
-	tar xvzf wslbridge-$(wslbridgever)-$(sys).tar.gz
-	mkdir -p bin
-	cp wslbridge-$(wslbridgever)-$(sys)/wslbridge* bin/
-	tr -d '\015' < wslbridge-$(wslbridgever)-$(sys)/LICENSE.txt > LICENSE.wslbridge
 
-wslbridge-source:	wslbridge-$(wslbridge-commit).zip
+wslbridge-source:	$(wslbridgedir).zip
-	unzip -o wslbridge-$(wslbridge-commit).zip
+	unzip -o $(wslbridgedir).zip
-	cd wslbridge-$(wslbridge-commit)/backend; patch -T -p1 < ../../wslbridge-backend-static.patch
+	cp $(wslbridgedir)/LICENSE LICENSE.wslbridge2
-	tr -d '\015' < wslbridge-$(wslbridge-commit)/LICENSE.txt > LICENSE.wslbridge
+	# patch
-
+	cd $(wslbridgedir); patch -p1 < ../0001-notify-size-change-inband.patch
-wslbridge-$(wslbridge-commit).zip:
+	# patch to https://github.com/Biswa96/wslbridge2/commit/41575379b416703c49e2687e957440239a4cdfb7
-	$(wgeto) https://github.com/rprichard/wslbridge/archive/$(wslbridge-commit).zip -o wslbridge-$(wslbridge-commit).zip
+	cd $(wslbridgedir); patch -p0 < ../0002-add-com-for-lifted-wsl.patch
 
 wslbridge-frontend:	wslbridge-source
-	echo ------------- Compiling wslbridge frontend
+	echo ------------- Compiling wslbridge2 frontend
-	cd wslbridge-$(wslbridge-commit)/frontend; make
-	strip wslbridge-$(wslbridge-commit)/out/wslbridge.exe
 	mkdir -p bin
-	cp wslbridge-$(wslbridge-commit)/out/wslbridge.exe bin/
+	# frontend build
+	cd $(wslbridgedir)/src; make -f Makefile.frontend RELEASE=1
+	# extract binaries
+	cp $(wslbridgedir)/bin/wslbridge2.exe bin/
 
-#wslbridge-backend:	wslbridge-source
+windir=$(shell cd "${WINDIR}"; pwd)
-# tweak dependency to support build testing on non-Windows 10:
+
-backend-bin=wslbridge-$(wslbridge-commit)/out/wslbridge-backend
+wslbridge-backend:	wslbridge-source
-backend-src=wslbridge-$(wslbridge-commit)/backend/wslbridge-backend.cc
+	echo ------------- Compiling wslbridge2 backend
-wslbridge-backend:	$(backend-bin) wslbridge-source
+	#uname -m | grep x86_64
-$(backend-bin):	$(backend-src)
-	echo ------------- Compiling wslbridge backend
-	cd wslbridge-$(wslbridge-commit)/backend; if uname -m | grep x86_64; then cmd /C wsl make; else wslbridge make; fi
 	mkdir -p bin
-	cp wslbridge-$(wslbridge-commit)/out/wslbridge-backend bin/
+	# provide dependencies for backend build
+	PATH="$(windir)/Sysnative:${PATH}" cmd /C wsl.exe -u root $(BuildDistr) $(shell env | grep http_proxy=) apk add make g++ linux-headers < /dev/null
+	# invoke backend build
+	cd $(wslbridgedir)/src; PATH="$(windir)/Sysnative:${PATH}" cmd /C wsl.exe $(BuildDistr) make -f Makefile.backend RELEASE=1 < /dev/null
+	# extract binaries
+	cp $(wslbridgedir)/bin/wslbridge2-backend bin/
 
 mintty-get:
 	$(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip
@@ -158,6 +187,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
@@ -193,7 +223,7 @@ mintty-appx:
 	cd mintty-$(minttyver)/src; sh ./mknames
 	cp mintty-$(minttyver)/src/charnames.txt usr/share/mintty/info/
 
-cygwin:	mkshortcutexe
+cygwin:	# mkshortcutexe
 	mkdir -p bin
 	cp /bin/cygwin1.dll bin/
 	cp /bin/cygwin-console-helper.exe bin/
@@ -215,38 +245,70 @@ appx-bin:
 	cp /bin/cygwin1.dll bin/
 	cp /bin/cygwin-console-helper.exe bin/
 
-cop:	ver
+CAB=wsltty-$(ver)-$(arch)
-	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/regtool.exe rel/
-	cp bin/mintty.exe rel/
-	cp bin/zoo.exe rel/
-	cp lang.zoo rel/
-	cp themes.zoo rel/
-	cp sounds.zoo rel/
-	cp charnames.txt rel/
-	cp bin/wslbridge.exe rel/
-	cp bin/wslbridge-backend rel/
-	cp bin/mkshortcut.exe rel/
-	cp bin/cygpopt-0.dll rel/
-	cp bin/cygiconv-2.dll rel/
-	cp bin/cygintl-8.dll rel/
-	cp LICENSE.* rel/
-	cp VERSION rel/
-	cp *.lnk rel/
-	cp *.ico rel/
-	cp *.url rel/
-	cp *.bat rel/
-	cp *.sh rel/
-	cp *.vbs rel/
 
-cab:	cop
+copcab:	ver
+	mkdir -p $(CAB)
+	cp bin/cygwin1.dll $(CAB)/
+	cp bin/cygwin-console-helper.exe $(CAB)/
+	cp bin/dash.exe $(CAB)/
+	cp bin/regtool.exe $(CAB)/
+	cp bin/mintty.exe $(CAB)/
+	cp bin/zoo.exe $(CAB)/
+	cp lang.zoo $(CAB)/
+	cp themes.zoo $(CAB)/
+	cp sounds.zoo $(CAB)/
+	cp charnames.txt $(CAB)/
+	cp bin/wslbridge2.exe $(CAB)/
+	cp bin/wslbridge2-backend $(CAB)/
+	cp mkshortcut.vbs $(CAB)/
+	#cp bin/mkshortcut.exe $(CAB)/
+	#cp bin/cygpopt-0.dll $(CAB)/
+	#cp bin/cygiconv-2.dll $(CAB)/
+	#cp bin/cygintl-8.dll $(CAB)/
+	cp LICENSE.* $(CAB)/
+	cp VERSION $(CAB)/
+	cp *.lnk $(CAB)/
+	cp *.ico $(CAB)/
+	cp *.url $(CAB)/
+	cp *.bat $(CAB)/
+	cp config-distros.sh $(CAB)/
+	cp mkshortcut.vbs $(CAB)/
+
+cop:	copcab
+	mkdir -p rel
+	cp -fl $(CAB)/* rel/
+
+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/$(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
 
+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
 
 installbat:
@@ -262,8 +324,11 @@ mintty-usr:	mintty-get mintty-appx
 # local wsltty build target:
 wsltty:	wslbridge cygwin mintty-build mintty-pkg
 
+# build software without installer:
+build:	wslbridge cygwin mintty-get mintty-build mintty-pkg
+
 # standalone wsltty package build target:
-pkg:	wslbridge cygwin mintty-get mintty-build mintty-pkg cab
+pkg:	wslbridge cygwin mintty-get mintty-build mintty-pkg installer
 
 # appx package contents target:
 wsltty-appx:	wslbridge appx-bin mintty-get mintty-build-appx mintty-appx

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.exe
+TargetName=wsltty-%version%-%arch%-install.exe
 FriendlyName=wsltty
 AppLaunched=cmd.exe /c install.bat
 PostInstallCmd=<None>
@@ -35,10 +35,10 @@ UserQuietInstCmd=
 FILE0="cygwin1.dll"
 FILE1="cygwin-console-helper.exe"
 FILE2="mintty.exe"
-FILE3="wslbridge.exe"
+FILE3="wslbridge2.exe"
-FILE4="wslbridge-backend"
+FILE4="wslbridge2-backend"
 FILE5="LICENSE.mintty"
-FILE6="LICENSE.wslbridge"
+FILE6="LICENSE.wslbridge2"
 FILE7="config-distros.sh"
 FILE8="configure WSL shortcuts.lnk"
 FILE9="charnames.txt"
@@ -57,10 +57,10 @@ FILE21="lang.zoo"
 FILE22="themes.zoo"
 FILE23="sounds.zoo"
 FILE24="mintty.ico"
-FILE25="mkshortcut.exe"
+FILE25="mkshortcut.vbs"
-FILE26="cygpopt-0.dll"
+FILE26="dequote.bat"
-FILE27="cygiconv-2.dll"
+FILE27="cmd2.bat"
-FILE28="cygintl-8.dll"
+FILE28="install-portable.bat"
 
 [SourceFiles]
 SourceFiles0=.

mkshortcut.vbs

@@ -1,7 +1,7 @@
 rem cscript mkshortcut.vbs [/param:arg] /target:link
 
 rem /target:%LOCALAPPDATA%\wsltty\bin\mintty.exe
-rem /workingdir:%USERPROFILE%
+rem /wdir:%USERPROFILE%
 rem /icon:%LOCALAPPDATA%\wsltty\wsl.ico
 rem deprecated: /icon:%LOCALAPPDATA%\lxss\bash.ico
 rem deprecated: %
@@ -29,8 +29,13 @@ rem wscript.echo "minttyargs: " & minttyargs
 rem wscript.echo lnk.Arguments
 
 rem Start in:
-rem lnk.WorkingDirectory = Wscript.Arguments.Named("workingdir")
+rem wdir = Wscript.Arguments.Named("wdir")
-lnk.WorkingDirectory = "%USERPROFILE%"
+wdir = wshell.ExpandEnvironmentStrings("%wdir%")
+if IsEmpty(wdir) then
+  lnk.WorkingDirectory = "%USERPROFILE%"
+else
+  lnk.WorkingDirectory = wdir
+end if
 
 rem Icon:
 rem icon = Wscript.Arguments.Named("icon")
@@ -48,6 +53,10 @@ rem lnk.HotKey = "ALT+CTRL+W"
 rem Run:
 rem 1: Normal 7: Minimized 3: Maximized
 rem lnk.WindowStyle = 1
+min = Wscript.Arguments.Named("min")
+if min then
+  lnk.WindowStyle = 7
+end if
 
 rem Comment:
 rem lnk.IconLocation = Wscript.Arguments.Named("desc")

uninstall.bat

@@ -1,34 +1,32 @@
 @echo off
 
-if "%installdir%" == "" set installdir=%LOCALAPPDATA%\wsltty
+if "%installdir%" == "" set installdir="%LOCALAPPDATA%\wsltty"
+call dequote installdir
 
 
 :shortcuts
 
 rem delete Start Menu Folder
-set smf=%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty
+set smf="%APPDATA%\Microsoft\Windows\Start Menu\Programs\WSLtty"
+call dequote smf
 rmdir /S /Q "%smf%"
 
-rem delete Desktop Shortcuts (not installed anymore)
-rem del "%USERPROFILE%\Desktop\WSL % in Mintty.lnk"
-rem del "%USERPROFILE%\Desktop\WSL ~ in Mintty.lnk"
-
 
 :start menu
 
-cd %installdir%
+cd /D "%installdir%"
 bin\dash.exe config-distros.sh -shortcuts-remove
 
 
 :explorer context menu
 
-cd %installdir%
+cd /D "%installdir%"
 bin\dash.exe config-distros.sh -contextmenu-remove
 
 
 :undeploy
 
-cd %installdir%
+cd /D "%installdir%"
 rem currently not removing software
 
 

wslbridge-backend-static.patch

@@ -1,76 +0,0 @@
-diff -rup old/Makefile new/Makefile
---- old/Makefile	2018-05-06 01:12:36.000000000 +0200
-+++ new/Makefile	2019-07-24 22:29:12.874257700 +0200
-@@ -8,7 +8,9 @@ all : ../out/wslbridge-backend
- 		-static-libgcc -static-libstdc++ \
- 		-D_GNU_SOURCE \
- 		-DWSLBRIDGE_VERSION=$(shell cat ../VERSION.txt) \
--		-Wall -O2 $< ../common/SocketIo.cc -o $@ -lutil -pthread
-+		-Wall -O2 $< ../common/SocketIo.cc -o $@ \
-+		-ldl -lutil -static -pthread \
-+		-Wl,--whole-archive -lpthread -Wl,--no-whole-archive
- 	$(STRIP) $@
- 
- clean:
-diff -rup old/wslbridge-backend.cc new/wslbridge-backend.cc
---- old/wslbridge-backend.cc	2018-05-06 01:12:36.000000000 +0200
-+++ new/wslbridge-backend.cc	2019-07-24 22:55:25.324307400 +0200
-@@ -494,6 +494,58 @@ static void frontendVersionCheck(const c
- 
- } // namespace
- 
-+#define getpwuid _getpwuid
-+
-+#include <dlfcn.h>
-+typedef struct passwd * (*__getpwuid_t)(int uid);
-+
-+struct passwd * getpwuid(int uid)
-+{
-+    void * dl = dlopen(0, 0);
-+printf("dlopen %p\n", dl);
-+    if (dl) {
-+        struct passwd * (*__getpwuid)(int uid) =
-+            (__getpwuid_t)dlsym(dl, "getpwuid");
-+printf("dlsym %p\n", __getpwuid);
-+        if (__getpwuid)
-+            return __getpwuid(uid);
-+    }
-+
-+    FILE * pwd = fopen("/etc/passwd", "r");
-+    if (pwd) {
-+        char pwbuf[222];
-+        static struct passwd pw;
-+        pw.pw_shell = 0;
-+        while (fgets(pwbuf, sizeof pwbuf, pwd)) {
-+            char * sep = strchr(pwbuf, ':');
-+            if (!sep) continue;
-+            sep = strchr(++sep, ':');
-+            if (!sep) continue;
-+            int pwuid;
-+            if (sscanf(sep, ":%d:", &pwuid) == 1 && pwuid == uid) {
-+                // pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell
-+                //                  ^
-+                sep = strchr(++sep, ':');
-+                if (!sep) continue;
-+                sep = strchr(++sep, ':');
-+                if (!sep) continue;
-+                sep = strchr(++sep, ':');
-+                if (!sep) continue;
-+                sep = strchr(++sep, ':');
-+                if (!sep) continue;
-+                pw.pw_shell = ++sep;
-+                sep = strchr(++sep, '\n');
-+                if (sep)
-+                    *sep = 0;
-+                break;
-+            }
-+        }
-+        fclose(pwd);
-+        return &pw;
-+    }
-+    return 0;
-+}
-+
- int main(int argc, char *argv[]) {
- 
-     // If the backend crashes, it prints a message to its stderr, which is a