1.9.6

do not deploy WSL default .lnk files anymore

README.md

@@ -121,6 +121,13 @@ To add launch entries for the default or all WSL distributions to the
 Explorer context menu, or remove them, run the respective script from the 
 Start Menu subfolder `WSLtty`.
 
+#### Icon ####
+
+Wsltty installation and the mintty terminal try to use the icon of the 
+respective WSL distribution. If it cannot be determined, a penguin icon 
+is used as a default. You can replace it with your preferred fallback icon 
+by replacing the icon file `%LOCALAPPDATA%\wsltty\wsl.ico`.
+
 #### Mintty settings ####
 
 Mintty can maintain its configuration file in various locations, 

VERSION

@@ -1 +1 @@
-1.9.5
+1.9.6

config-distros.sh

@@ -178,17 +178,18 @@ do
       # context menu entries
       #cmd /C mkcontext "$name"
       direckey='HKEY_CURRENT_USER\Software\Classes\Directory'
+      keyname="${name}_Terminal"
       if $remove
       then
-        reg delete "$direckey\\shell\\$name" /f
-        reg delete "$direckey\\Background\\shell\\$name" /f
+        reg delete "$direckey\\shell\\$keyname" /f
+        reg delete "$direckey\\Background\\shell\\$keyname" /f
       else
-        reg add "$direckey\\shell\\$name" /d "$name Terminal" /f
-        reg add "$direckey\\shell\\$name" /v Icon /d "$icon" /f
-        cmd /C reg add "$direckey\\shell\\$name\\command" /d "\"$target\" -i \"$icon\" --dir \"%1\" $minttyargs $bridgeargs" /f
-        reg add "$direckey\\Background\\shell\\$name" /d "$name Terminal" /f
-        reg add "$direckey\\Background\\shell\\$name" /v Icon /d "$icon" /f
-        cmd /C reg add "$direckey\\Background\\shell\\$name\\command" /d "\"$target\" -i \"$icon\" $minttyargs $bridgeargs" /f
+        reg add "$direckey\\shell\\$keyname" /d "$name Terminal" /f
+        reg add "$direckey\\shell\\$keyname" /v Icon /d "$icon" /f
+        cmd /C reg add "$direckey\\shell\\$keyname\\command" /d "\"$target\" -i \"$icon\" --dir \"%1\" $minttyargs $bridgeargs" /f
+        reg add "$direckey\\Background\\shell\\$keyname" /d "$name Terminal" /f
+        reg add "$direckey\\Background\\shell\\$keyname" /v Icon /d "$icon" /f
+        cmd /C reg add "$direckey\\Background\\shell\\$keyname\\command" /d "\"$target\" -i \"$icon\" $minttyargs $bridgeargs" /f
       fi
     else
       # invocation shortcuts and scripts

install.bat

@@ -26,11 +26,12 @@ 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%"
+rem copy "WSL Terminal.lnk" "%installdir%"
+rem copy "WSL Terminal %%.lnk" "%installdir%"
 copy config-distros.sh "%installdir%"
 copy mkshortcut.vbs "%installdir%"
+rem allow persistent customization of default icon:
+if not exist "%installdir%\wsl.ico" copy tux.ico "%installdir%\wsl.ico"
 
 if not exist "%installdir%\bin" goto instbin
 rem move previous programs possibly in use out of the way
@@ -62,7 +63,8 @@ copy themes.zoo "%installdir%\usr\share\mintty\themes"
 mkdir "%installdir%\usr\share\mintty\info"
 copy charnames.txt "%installdir%\usr\share\mintty\info"
 mkdir "%installdir%\usr\share\mintty\icon"
-copy wsl.ico "%installdir%\usr\share\mintty\icon"
+copy tux.ico "%installdir%\usr\share\mintty\icon"
+copy mintty.ico "%installdir%\usr\share\mintty\icon"
 
 
 rem create Start Menu Folder
@@ -77,8 +79,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 copy "WSL Terminal.lnk" "%smf%"
+rem copy "WSL Terminal %%.lnk" "%smf%"
 rem clean up previous installation
 rmdir /S /Q "%smf%\context menu shortcuts"
 

makefile

@@ -8,10 +8,10 @@
 
 
 # wsltty release
-ver=1.9.5
+ver=1.9.6
 
 # wsltty appx release - must have 4 parts!
-verx=1.9.5.0
+verx=1.9.6.0
 
 # Windows SDK version for appx
 WINSDKKEY=/HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/.NET Framework Platform/Setup/Multi-Targeting Pack
@@ -19,7 +19,7 @@ WINSDKVER=`regtool list '$(WINSDKKEY)' | sed -e '$$ q' -e d`
 
 ##############################
 # mintty release version
-minttyver=2.9.5
+minttyver=2.9.6
 
 # or mintty branch or commit version
 #minttyver=master
@@ -140,6 +140,7 @@ wslbridge-backend:	wslbridge-source
 mintty-get:
 	$(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip
 	unzip -o mintty-$(minttyver).zip
+	cp mintty-$(minttyver)/icon/terminal.ico mintty.ico
 
 wslbuild=LDFLAGS="-static -static-libgcc -s"
 appxbuild=$(wslbuild) CCOPT=-DWSLTTY_APPX

makewinx.cfg

@@ -47,7 +47,7 @@ FILE11="dash.exe"
 FILE12="regtool.exe"
 FILE13="install.bat"
 FILE14="uninstall.bat"
-FILE15="wsl.ico"
+FILE15="tux.ico"
 FILE16="add to context menu.lnk"
 FILE17="add default to context menu.lnk"
 FILE18="remove from context menu.lnk"
@@ -55,9 +55,8 @@ FILE19="wsltty home & help.url"
 FILE20="zoo.exe"
 FILE21="lang.zoo"
 FILE22="themes.zoo"
-FILE23="WSL Terminal %.lnk"
-FILE24="WSL Terminal.lnk"
-FILE25="mkshortcut.vbs"
+FILE23="mkshortcut.vbs"
+FILE24="mintty.ico"
 
 [SourceFiles]
 SourceFiles0=.
@@ -88,5 +87,4 @@ SourceFiles0=.
 %FILE22%=
 %FILE23%=
 %FILE24%=
-%FILE25%=