From ace39cbd03d64dbbfca1c467c9704b22cd92a59b Mon Sep 17 00:00:00 2001
From: mintty <mintty@users.noreply.github.com>
Date: Wed, 18 Apr 2018 10:46:17 +0200
Subject: [PATCH] revert fruitless attempt to hide VBS from aggressive virus
 scanners (~#94)

---
 README.md                        | 0
 VERSION                          | 2 +-
 config-distros.sh                | 2 --
 install.bat                      | 6 +++++-
 makefile                         | 4 ++--
 makewinx.cfg                     | 8 ++++++--
 mkshortcut.bat => mkshortcut.vbs | 2 +-
 7 files changed, 15 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 README.md
 rename mkshortcut.bat => mkshortcut.vbs (94%)

diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/VERSION b/VERSION
index 8decb92..abfd13d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.5
+1.8.5.2
diff --git a/config-distros.sh b/config-distros.sh
index f07d909..57d76f5 100755
--- a/config-distros.sh
+++ b/config-distros.sh
@@ -197,8 +197,6 @@ do
         cmd /C del "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name.bat"
         cmd /C del "%LOCALAPPDATA%\\Microsoft\\WindowsApps\\$name~.bat"
       else
-        cmd /C copy mkshortcut.bat mkshortcut.vbs
-
         # desktop shortcut in %USERPROFILE% -> Start Menu - WSLtty
         cscript /nologo mkshortcut.vbs "/name:$name Terminal %"
         cmd /C copy "$name Terminal %.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
diff --git a/install.bat b/install.bat
index 5e34fef..0cf8a57 100755
--- a/install.bat
+++ b/install.bat
@@ -26,9 +26,11 @@ copy "add to context menu.lnk" "%installdir%"
 copy "add default to context menu.lnk" "%installdir%"
 copy "remove from context menu.lnk" "%installdir%"
 copy "configure WSL shortcuts.lnk" "%installdir%"
+copy "WSL Terminal.lnk" "%installdir%"
+copy "WSL Terminal %%.lnk" "%installdir%"
 copy wsl.ico "%installdir%"
 copy config-distros.sh "%installdir%"
-copy mkshortcut.bat "%installdir%"
+copy mkshortcut.vbs "%installdir%"
 
 if not exist "%installdir%\bin" goto instbin
 rem move previous programs possibly in use out of the way
@@ -75,6 +77,8 @@ copy "add to context menu.lnk" "%smf%"
 copy "add default to context menu.lnk" "%smf%"
 copy "remove from context menu.lnk" "%smf%"
 copy "configure WSL shortcuts.lnk" "%smf%"
+copy "WSL Terminal.lnk" "%smf%"
+copy "WSL Terminal %%.lnk" "%smf%"
 rem clean up previous installation
 rmdir /S /Q "%smf%\context menu shortcuts"
 
diff --git a/makefile b/makefile
index 950f8ea..0977264 100644
--- a/makefile
+++ b/makefile
@@ -8,7 +8,7 @@
 
 
 # wsltty release
-ver=1.8.5
+ver=1.8.5.3
 
 ##############################
 # mintty release version
@@ -163,7 +163,7 @@ cop:	ver
 	cp *.url rel/
 	cp *.bat rel/
 	cp *.sh rel/
-	#cp *.vbs rel/
+	cp *.vbs rel/
 
 cab:	cop
 	cd rel; iexpress /n wsltty.SED
diff --git a/makewinx.cfg b/makewinx.cfg
index 876d774..aa3f2d6 100644
--- a/makewinx.cfg
+++ b/makewinx.cfg
@@ -41,7 +41,7 @@ FILE5="LICENSE.mintty"
 FILE6="LICENSE.wslbridge"
 FILE7="config-distros.sh"
 FILE8="configure WSL shortcuts.lnk"
-FILE9="mkshortcut.bat"
+FILE9="charnames.txt"
 FILE10="VERSION"
 FILE11="dash.exe"
 FILE12="regtool.exe"
@@ -55,7 +55,9 @@ FILE19="wsltty home & help.url"
 FILE20="zoo.exe"
 FILE21="lang.zoo"
 FILE22="themes.zoo"
-FILE23="charnames.txt"
+FILE23="WSL Terminal %.lnk"
+FILE24="WSL Terminal.lnk"
+FILE25="mkshortcut.vbs"
 
 [SourceFiles]
 SourceFiles0=.
@@ -85,4 +87,6 @@ SourceFiles0=.
 %FILE21%=
 %FILE22%=
 %FILE23%=
+%FILE24%=
+%FILE25%=
 
diff --git a/mkshortcut.bat b/mkshortcut.vbs
similarity index 94%
rename from mkshortcut.bat
rename to mkshortcut.vbs
index 59ef717..9e0bf92 100755
--- a/mkshortcut.bat
+++ b/mkshortcut.vbs
@@ -1,4 +1,4 @@
-rem cscript mkshortcut [/param:arg] /target:link
+rem cscript mkshortcut.vbs [/param:arg] /target:link
 
 rem /target:%LOCALAPPDATA%\wsltty\bin\mintty.exe
 rem /workingdir:%USERPROFILE%