From d5cc2bfe777814b6509a4422c7476ed148b34616 Mon Sep 17 00:00:00 2001
From: mintty <mintty@users.noreply.github.com>
Date: Mon, 23 Oct 2017 00:01:54 +0200
Subject: [PATCH] 2.8.0

---
 VERSION              |   2 +-
 WSL % in Mintty.lnk  | Bin 2029 -> 0 bytes
 WSL -l in Mintty.lnk | Bin 2035 -> 0 bytes
 WSL ~ in Mintty.lnk  | Bin 2037 -> 0 bytes
 makefile             |  23 ++++++++++++++---------
 wsl-l.bat            |  13 -------------
 wsl.bat              |  13 -------------
 wsl~.bat             |  13 -------------
 8 files changed, 15 insertions(+), 49 deletions(-)
 delete mode 100755 WSL % in Mintty.lnk
 delete mode 100755 WSL -l in Mintty.lnk
 delete mode 100755 WSL ~ in Mintty.lnk
 delete mode 100755 wsl-l.bat
 delete mode 100755 wsl.bat
 delete mode 100755 wsl~.bat

diff --git a/VERSION b/VERSION
index 972ef76..27f9cd3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.7.9
+1.8.0
diff --git a/WSL % in Mintty.lnk b/WSL % in Mintty.lnk
deleted file mode 100755
index f51f7cf359938bc83677416f71527a4ead8aaf8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2029
zcmd^9TSydP6h50KcEin91<@RYl?X4p>orqinswcsCR|)Cts&agZQI;+H)rw!t@#uf
zNTd|KghEAcJ%v$8_##4-#9B{12ocniKKPVG_Wd*Cl`il0|D6Bw{pWn={O8R45)qj!
zyD$<>Ya_XqvE?`-&urEB`}w44ZH{<G7gm!=6Q!qVnkHR;eN37xRN!pPO=<5r@x(bi
z(|Y%3mu+#7RLUd4<#T0|UDNG#4<#}=J|1`aRX-3lxBbGsg?aZ#D5rdC@yN@WcPk6y
zp)>q&<IHT=^yG~?N~cs>dfn?zB$(|{*c50Xr>^_f7d*w$o#cm4#(a__!{>_F*Kg*e
zScgACHJkVt&iF<(zLafz62+(kOcCG~@~(3gi)OA*iKyxTQLVvt+*78kh{YmfOMl2B
z%i6})M+%r!beK^#xeUJV;{E|M7YKJ#g~3%MzDY2YalNS8jdA-;0~Dri;F%<o0}j(@
zQp}8STr}K`s7izVL3VpRZ_mZ^3KPbb6=t>5>y3rcq8ghXSt$jnA3~H1xdO?9uv)XZ
z9Ku={k^^BG6Q&XsX3V~JUrWPj5^CjECD^0Lox!NmU2Sv7MyX{j{j#1o8TXYpM|*&*
z)Ji^Tpk`#cnVOIv59-$dypu}M_55*IT_z3@_Mo#}32GEWHZCEm5Ol-9>!}cSJea)r
z9(ZbjSdpvEH7L}qV;DE;9E7E?jtlVQ2b%(KDo$F#<AT2$Xq1s&gEE6N0KG80hoH-%
zQn%;?z@vaIA5loSn}B#E$kzDQxb#Y_?MlJRZfHTWO+*t`sY&1^-s^SpExh$l`9wi>
zaQj;pw^ms;>Lk<ezw#ZNr2pV*?A^ipII)Um!J55M`>?;BF}G~;ycKV{KYlosx^$bJ
zJ%H@N*&WPwpV#;KR-0=|su5oOI5bvtKRR~}xc1H#Fa?MYzp))s32|sEJJ!eW2s$v^
zF;;7+gR1a!+ko3J>o~Kl(e&6E!<a2Y9nfQTmGH39E@FxQd!o&NDmy||cAH%d^yt9g
oCwYt$mV`$`6_)(RUrOqp1@<1k`t{(`Z}D>(BWLUXb<S9R0l3B#?*IS*

diff --git a/WSL -l in Mintty.lnk b/WSL -l in Mintty.lnk
deleted file mode 100755
index 0c75c1c4d776530304fc19ee25272480eb4c2c79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2035
zcmd^9T}TvB6h50K_J?Mxf@ltc65;CZ`nQ=9)2!?6G~wcEX${e?ZrkR%yX{Q=Kx;k)
z1`;VnFQHJ;TTfwB626EKC871ygAhSI>4Q&6WZ#_`f9dDl?&aK{@1FCWbI+N%5)qlq
zyD$<>X(PFovE?`-&rJ2$`}sN3+8ptWEUeDWnJ7I?(=_S&>*JisOoh(Iyp;CDi6_pX
z>DIeHyR3@?q*6W!E}tuhY?^M5doY>B@$tCRulj+gdF>bOEzG-zL%9``i$`8gzgt-t
z3!UMI8mDKvrY3IGQ97m4((4{~GRbU@!lqCQId$E)zThd2?j%2aGUk&c89rCU-o8vu
zigoxS<k-Z=aK<;H@uh6zlPE?VV2S`YlXsn~RLtahm58eL6V)1Q$35lBidZT#w)BTA
zvg~bay`+FiMTZ&XkjvovF7EHo<O1O+RT^9+;+rHx8P|*I-59suG(cgB0?#6u>~NSy
z6Jl0`<GRC9L{%2-3$okmd3!FNSC}xi>@cgHUT-Xn)~&JWk(E)9`XEGkkSmaU2&*-l
zD<G_eA-NEiF<~-UnTgrg?rUi{O+u~Qsss~?+!^dvqBT~#Y?NBo(l6_YlW|{pbF>Gj
zm|Dq44b+TGH&YYx<3arzfQQI}uIG=#>N0VNFoDi?7St$)Y+OQAA?n1Kpn58T9S<fi
zz6YLKAjQbl<{A`f)-jA5bq>N(SjPo;@`Fu*Hx(zX;Bmp90~+O|*Pz_s3_vdo?;+^2
zsMIYw0q`hV+!lNT1&Bq$4FyCcLAFM@#;Dh0ZC3_%c26@>ZXy~lmYM`!;=Nuc-@+IF
zDXS>U4sL(T;?`QrMzv)6{kOh@lk^{4jlDj2CC69M%viIRY9IF3GiH}fp10yn_s0*X
zQkQPCvj>npIJ<+{=JWbK-)eJBN)F-Gk3*v+_q%7W0oPvJLZ$%m;b*o%svvf4WyAUy
zo<cij8^#(9wNo`7a4T>tW*uji4o#1pF^t(V)DAsnR|O9n?IM==zsK7QsH!7WZL`|c
sKtcxwKFOn;up~ShtTY!q{$i<n7TA0E>equ$zs1jG44<w4*EwVP1tFvrs{jB1

diff --git a/WSL ~ in Mintty.lnk b/WSL ~ in Mintty.lnk
deleted file mode 100755
index 9b666e64fcaef76f01272cb0bafecaff5cdc60bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2037
zcmd^9TSydP6h50KcEin91<@P?CBn<@dTBEyrdd~ans9O5(i);&-PX-@ciWk~Kx;k)
z1`;VnFQHJ;TTfwB626EKC871ygAhSI>4Q&6WZyqCUg`2~|Ihg^-+#_`&VSC#FA<T+
zvI`^8ls1xU8C#Aca?ezcy`P^mt<4el$inK}oQcxYG)<GPzdp{HEL7lZ$W3WWoP6RO
zn)coO*=1cEAeHh+aCu$XWYcte8V8e^93PK6{i+{`n%j2q-okw2a44r@a`DK^>31s&
zW1+MBP{Z_0*VM#~T1ux>T6*2nm`pO;qp&H^LQY-xtuJ_rqdUnDpN#nwNrulAvA566
zNwIc+gdCgr7|!@cG`^H=d=kZ|9ZV767V@lfm564pSBa=<KT(arcEVk*tcWEdV@rR?
zBFoyw)=LVQRCJh8Hn|MG@8bS`GZzR)snXyo7T+Wp%D7%s@5Z?OrU4356nG}dWQW5v
znh-N19M>I=BC4`rUy$8i&)akHg2IHcWrbPo^m=1qv~G<}kF1P>)CVETg<OH;L0GNX
zTmfM%49S78j0uy;N;76}o42L@3<))|PYEUzxg*%EM2}hRvQcVTOTVlqPR4!Z&Cwp9
zBJz=!>Zuu-Zl)&W$Bp{c1Mj3#bUl9@R-MEl!UQ_om7+#5WaBcT3Q-5f1l3U??07JF
z@ICO<0x3eSHrJp~vyNfhsB;jO!a6R%lOJpfys0?xfyV`Z4rr8<UW0OjGXT9XyoaF6
zq7rC8o7FA40q`kc%||p6?kFHG39>cLHBP-EYr8V=vzuCwbQ95dk<=vc67TUi`4+zD
zPkBXQc5wS!7PnSgHtHqQ@4xmPoTUHYYV7^NJ2}3JX2F`hRr|2No-w;@a=#UCHh%nY
zI(6wbJ9_}xgR?uBZC;P}^Q~6bq~s7@{WvsQe7}448gT8sEno@|FMekmqzYo!RyM4U
z<1w^jwqZP`p?0dq6K(}=#jNAZ(xK_GGlnr+hT5UW?5f~lqg}!h|Mz&S0adk!s%=)A
t8c68Cz$bZ>6PAQWgO!&2$6rcop9S_FzWVjx({J(f8N=u5{&mh+egXby76AYN

diff --git a/makefile b/makefile
index 26f7324..223d4df 100644
--- a/makefile
+++ b/makefile
@@ -9,25 +9,27 @@
 all:	check pkg
 
 # wsltty release
-ver=1.7.9
+ver=1.8.0
 
 # mintty release version
-minttyver=2.7.9
+minttyver=2.8.0
 #minttyver=master
 
 # wslbridge backend version
-wslbridgever=0.2.3
+wslbridgever=0.2.4
 
 # wslbridge frontend version
 # release 0.2.0 does not have cygwin_internal(CW_SYNC_WINENV) yet;
 # therefore using "master" below
 #wslbridge-frontend=wslbridge-frontend
 # release 0.2.1 is updated and complete, no separate frontend build needed:
-#wslbridge-frontend=
-#wslbridge-commit=master
-# use --distro-guid option:
-wslbridge-frontend=wslbridge-frontend
-wslbridge-commit=cb22e3f6f989cefe5b6599d3c04422ded74db664
+wslbridge-frontend=
+# only used if wslbridge-frontend non-empty:
+wslbridge-commit=master
+
+# use --distro-guid option (merged into 0.2.4):
+#wslbridge-frontend=wslbridge-frontend
+#wslbridge-commit=cb22e3f6f989cefe5b6599d3c04422ded74db664
 
 #############################################################################
 # target checking and some defs
@@ -91,8 +93,11 @@ mintty-get:
 	$(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip
 	unzip -o mintty-$(minttyver).zip
 
+wslbuild=LDFLAGS="-static -static-libgcc -s"
+wslversion=VERSION_SUFFIX="– wsltty $(ver)" WSLTTY_VERSION="$(ver)"
+
 mintty-build:
-	cd mintty-$(minttyver)/src; make LDFLAGS="-static -static-libgcc -s" VERSION_SUFFIX="– wsltty $(ver)"
+	cd mintty-$(minttyver)/src; make $(wslbuild) $(wslversion)
 	mkdir -p bin
 	cp mintty-$(minttyver)/bin/mintty.exe bin/
 	cp mintty-$(minttyver)/LICENSE LICENSE.mintty
diff --git a/wsl-l.bat b/wsl-l.bat
deleted file mode 100755
index 9aa084d..0000000
--- a/wsl-l.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-
-rem Start mintty terminal for WSL with login shell
-
-if "%installdir%" == "" set installdir=%LOCALAPPDATA%\wsltty
-if "%configdir%" == "" set configdir=%APPDATA%\wsltty
-
-rem To enable invocation of this script from WIN+R or from cmd.exe,
-rem you may want to copy this script into "%SYSTEMROOT%\System32",
-rem or include the installation folder "%LOCALAPPDATA%\wsltty" in your PATH
-
-"%installdir%\bin\mintty.exe" --wsl -h err "--configdir=%configdir%" -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\wsltty\wsl.ico" /bin/wslbridge -t /bin/bash -l
-
diff --git a/wsl.bat b/wsl.bat
deleted file mode 100755
index af4ed8c..0000000
--- a/wsl.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-
-rem Start mintty terminal for WSL in current directory
-
-if "%installdir%" == "" set installdir=%LOCALAPPDATA%\wsltty
-if "%configdir%" == "" set configdir=%APPDATA%\wsltty
-
-rem To enable invocation of this script from WIN+R or from cmd.exe,
-rem you may want to copy this script into "%SYSTEMROOT%\System32",
-rem or include the installation folder "%LOCALAPPDATA%\wsltty" in your PATH
-
-"%installdir%\bin\mintty.exe" --wsl -h err "--configdir=%configdir%" -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\wsltty\wsl.ico" /bin/wslbridge -t /bin/bash
-
diff --git a/wsl~.bat b/wsl~.bat
deleted file mode 100755
index 47f64d1..0000000
--- a/wsl~.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-
-rem Start mintty terminal for WSL in WSL home directory
-
-if "%installdir%" == "" set installdir=%LOCALAPPDATA%\wsltty
-if "%configdir%" == "" set configdir=%APPDATA%\wsltty
-
-rem To enable invocation of this script from WIN+R or from cmd.exe,
-rem you may want to copy this script into "%SYSTEMROOT%\System32",
-rem or include the installation folder "%LOCALAPPDATA%\wsltty" in your PATH
-
-"%installdir%\bin\mintty.exe" --wsl -h err "--configdir=%configdir%" -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\wsltty\wsl.ico" /bin/wslbridge -C~ -t /bin/bash
-