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

fix and polish install tweaks

Browse Source
This commit is contained in:
mintty
2019-08-07 20:37:08 +02:00
parent 7940883bd6
commit 639ed3da8f
5 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
3.0.2.2 3.0.2.3

6
config-distros.sh
View File

@@ -125,8 +125,10 @@ then
mkshortcut.exe -n "add default to context menu" -a "$installdir/config-distros.sh -contextmenu-default" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir" mkshortcut.exe -n "add default to context menu" -a "$installdir/config-distros.sh -contextmenu-default" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir"
mkshortcut.exe -n "remove from context menu" -a "$installdir/config-distros.sh -contextmenu-remove" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir" mkshortcut.exe -n "remove from context menu" -a "$installdir/config-distros.sh -contextmenu-remove" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir"
mkshortcut.exe -n "configure WSL shortcuts" -a "$installdir/config-distros.sh" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir" mkshortcut.exe -n "configure WSL shortcuts" -a "$installdir/config-distros.sh" "$installdir/bin/dash.exe" -i '%SystemRoot%\System32\filemgmt.dll' -s min -d "" -w "$installdir"
smf="$APPDATA/Microsoft/Windows/Start Menu/Programs/WSLtty" cmd /C copy "add to context menu.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
cp "add to context menu.lnk" "add default to context menu.lnk" "remove from context menu.lnk" "configure WSL shortcuts.lnk" "$smf" cmd /C copy "add default to context menu.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
cmd /C copy "remove from context menu.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
cmd /C copy "configure WSL shortcuts.lnk" "%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\WSLtty"
fi fi
lxss="/HKEY_CURRENT_USER/Software/Microsoft/Windows/CurrentVersion/Lxss" lxss="/HKEY_CURRENT_USER/Software/Microsoft/Windows/CurrentVersion/Lxss"

5
install.bat
View File

@@ -31,8 +31,6 @@ rem copy "WSL Terminal %%.lnk" "%installdir%"
copy config-distros.sh "%installdir%" copy config-distros.sh "%installdir%"
rem copy mkshortcut.vbs "%installdir%" rem copy mkshortcut.vbs "%installdir%"
copy mkshortcut.exe "%installdir%"
copy cygpopt-0.dll "%installdir%"
rem allow persistent customization of default icon: rem allow persistent customization of default icon:
if not exist "%installdir%\wsl.ico" copy tux.ico "%installdir%\wsl.ico" if not exist "%installdir%\wsl.ico" copy tux.ico "%installdir%\wsl.ico"
@@ -61,6 +59,9 @@ copy dash.exe "%installdir%\bin"
copy regtool.exe "%installdir%\bin" copy regtool.exe "%installdir%\bin"
copy zoo.exe "%installdir%\bin" copy zoo.exe "%installdir%\bin"
copy mkshortcut.exe "%installdir%"\bin
copy cygpopt-0.dll "%installdir%"\bin
rem create system config directory and copy config archive rem create system config directory and copy config archive
mkdir "%installdir%\usr\share\mintty\lang" mkdir "%installdir%\usr\share\mintty\lang"
copy lang.zoo "%installdir%\usr\share\mintty\lang" copy lang.zoo "%installdir%\usr\share\mintty\lang"

11
makefile
View File

@@ -8,10 +8,10 @@
# wsltty release # wsltty release
ver=3.0.2.2 ver=3.0.2.3
# wsltty appx release - must have 4 parts! # wsltty appx release - must have 4 parts!
verx=3.0.2.2 verx=3.0.2.3
# Windows SDK version for appx # Windows SDK version for appx
WINSDKKEY=/HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/.NET Framework Platform/Setup/Multi-Targeting Pack WINSDKKEY=/HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/.NET Framework Platform/Setup/Multi-Targeting Pack
@@ -193,7 +193,7 @@ mintty-appx:
cd mintty-$(minttyver)/src; sh ./mknames cd mintty-$(minttyver)/src; sh ./mknames
cp mintty-$(minttyver)/src/charnames.txt usr/share/mintty/info/ cp mintty-$(minttyver)/src/charnames.txt usr/share/mintty/info/
cygwin: mkshortcut cygwin: mkshortcutexe
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/
@@ -201,7 +201,10 @@ cygwin: mkshortcut
cp /bin/regtool.exe bin/ cp /bin/regtool.exe bin/
cp /bin/zoo.exe bin/ cp /bin/zoo.exe bin/
mkshortcut: bin/mkshortcut.exe mkshortcutexe: bin/mkshortcut.exe
bin/mkshortcut.exe: mkshortcut.c
echo mksh
gcc -o bin/mkshortcut mkshortcut.c -lpopt -lole32 /usr/lib/w32api/libuuid.a gcc -o bin/mkshortcut mkshortcut.c -lpopt -lole32 /usr/lib/w32api/libuuid.a
cp /bin/cygpopt-0.dll bin/ cp /bin/cygpopt-0.dll bin/

9
mkshortcut.c
View File

@@ -87,7 +87,14 @@ void * _cygwin_create_path (int line, cygwin_conv_path_t what, const void *from)
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
#include "common.h"
//#include "common.h"
#include <stdio.h>
#include <popt.h>
#include <sys/stat.h>
#include <errno.h>
#define PACKAGE_VERSION "*"
#include <locale.h> #include <locale.h>
#include <wchar.h> #include <wchar.h>