sascha/wsltty
1
0
Fork 0
mirror of https://github.com/mintty/wsltty.git synced 2025-10-30 22:54:03 +00:00
Code Issues Releases Wiki Activity

deploy two icons, allow previous icon to persist (#132),

Browse Source 
do not deploy WSL default .lnk files anymore
This commit is contained in:
mintty
2019-01-20 19:49:49 +01:00
parent e5c67ecc7c
commit 23fc790c26
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
install.bat
View File

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

1
makefile
View File

@@ -140,6 +140,7 @@ wslbridge-backend: wslbridge-source
mintty-get: mintty-get:
$(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip $(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip
unzip -o mintty-$(minttyver).zip unzip -o mintty-$(minttyver).zip
cp mintty-$(minttyver)/icon/terminal.ico mintty.ico
wslbuild=LDFLAGS="-static -static-libgcc -s" wslbuild=LDFLAGS="-static -static-libgcc -s"
appxbuild=$(wslbuild) CCOPT=-DWSLTTY_APPX appxbuild=$(wslbuild) CCOPT=-DWSLTTY_APPX

8
makewinx.cfg
View File

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