sascha/wsltty
1
0
Fork 0
mirror of https://github.com/mintty/wsltty.git synced 2025-02-07 05:31:04 +00:00
Code Issues Releases Wiki Activity

Use new mintty option --dir, simplifying registry entry for context menu and dropping the need for dash.exe

Browse Source
This commit is contained in:
mintty 2016-09-29 14:53:34 +02:00
parent eef97b91d7
commit 74cb9ea92b
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
install.bat
View File

@ -15,7 +15,7 @@ rem copy wsl.bat "%SYSTEMROOT%\System32"
mkdir "%LOCALAPPDATA%\wsltty\bin" mkdir "%LOCALAPPDATA%\wsltty\bin"
copy cygwin1.dll "%LOCALAPPDATA%\wsltty\bin" copy cygwin1.dll "%LOCALAPPDATA%\wsltty\bin"
copy cygwin-console-helper.exe "%LOCALAPPDATA%\wsltty\bin" copy cygwin-console-helper.exe "%LOCALAPPDATA%\wsltty\bin"
copy dash.exe "%LOCALAPPDATA%\wsltty\bin" rem copy dash.exe "%LOCALAPPDATA%\wsltty\bin"
copy mintty.exe "%LOCALAPPDATA%\wsltty\bin" copy mintty.exe "%LOCALAPPDATA%\wsltty\bin"
copy wslbridge.exe "%LOCALAPPDATA%\wsltty\bin" copy wslbridge.exe "%LOCALAPPDATA%\wsltty\bin"
copy wslbridge-backend "%LOCALAPPDATA%\wsltty\bin" copy wslbridge-backend "%LOCALAPPDATA%\wsltty\bin"
@ -57,7 +57,8 @@ set cset=-o Locale=C -o Charset=UTF-8
set icon=%LOCALAPPDATA%\lxss\bash.ico set icon=%LOCALAPPDATA%\lxss\bash.ico
set arg=/bin/wslbridge -t %shell% set arg=/bin/wslbridge -t %shell%
set target0=\"%cmd%\" %cset% -i \"%icon%\" %arg% set target0=\"%cmd%\" %cset% -i \"%icon%\" %arg%
set target1=\"%cmd%\" %cset% -i \"%icon%\" /bin/dash -c \"cd '%%1'; exec %arg%\" rem set target1=\"%cmd%\" %cset% -i \"%icon%\" /bin/dash -c \"cd '%%1'; exec %arg%\"
set target1=\"%cmd%\" %cset% -i \"%icon%\" --dir \"%%1\" %arg%
reg add "%userdirname%\wsltty" /d "%label% %here%" /f reg add "%userdirname%\wsltty" /d "%label% %here%" /f
reg add "%userdirname%\wsltty" /v Icon /d "%icon%" /f reg add "%userdirname%\wsltty" /v Icon /d "%icon%" /f

8
makefile
View File

@ -2,8 +2,8 @@
# default: generate all # default: generate all
all: wslbridge mintty cygwin wsltty pkg all: wslbridge mintty cygwin wsltty pkg
ver=0.6.0 ver=0.6.1
wslbridgever=0.1.0 wslbridgever=0.2.0
TARGET := $(shell $(CC) -dumpmachine) TARGET := $(shell $(CC) -dumpmachine)
@ -44,7 +44,7 @@ cygwin:
mkdir -p bin mkdir -p bin
cp /bin/cygwin1.dll bin/ cp /bin/cygwin1.dll bin/
cp /bin/cygwin-console-helper.exe bin/ cp /bin/cygwin-console-helper.exe bin/
cp /bin/dash.exe bin/ #cp /bin/dash.exe bin/
wsltty: wsltty:
@ -53,7 +53,7 @@ pkg:
sed -e "s,%version%,$(ver)," makewinx.cfg > rel/wsltty.SED sed -e "s,%version%,$(ver)," makewinx.cfg > rel/wsltty.SED
cp bin/cygwin1.dll rel/ cp bin/cygwin1.dll rel/
cp bin/cygwin-console-helper.exe rel/ cp bin/cygwin-console-helper.exe rel/
cp bin/dash.exe rel/ #cp bin/dash.exe rel/
cp bin/mintty.exe rel/ cp bin/mintty.exe rel/
cp bin/wslbridge.exe rel/ cp bin/wslbridge.exe rel/
cp bin/wslbridge-backend rel/ cp bin/wslbridge-backend rel/

20
makewinx.cfg
View File

@ -34,16 +34,15 @@ AdminQuietInstCmd=
UserQuietInstCmd= UserQuietInstCmd=
FILE0="cygwin1.dll" FILE0="cygwin1.dll"
FILE1="cygwin-console-helper.exe" FILE1="cygwin-console-helper.exe"
FILE2="dash.exe" FILE2="mintty.exe"
FILE3="mintty.exe" FILE3="wslbridge.exe"
FILE4="wslbridge.exe" FILE4="wslbridge-backend"
FILE5="wslbridge-backend" FILE5="LICENSE.mintty"
FILE6="LICENSE.mintty" FILE6="LICENSE.wslbridge"
FILE7="LICENSE.wslbridge" FILE7="Bash on UoW in Mintty.lnk"
FILE8="Bash on UoW in Mintty.lnk" FILE8="wsl.bat"
FILE9="wsl.bat" FILE9="install.bat"
FILE10="install.bat" FILE10="uninstall.bat"
FILE11="uninstall.bat"
[SourceFiles] [SourceFiles]
SourceFiles0=. SourceFiles0=.
@ -60,5 +59,4 @@ SourceFiles0=.
%FILE8%= %FILE8%=
%FILE9%= %FILE9%=
%FILE10%= %FILE10%=
%FILE11%=