1
0
mirror of https://github.com/mintty/wsltty.git synced 2025-11-05 17:41:51 +00:00

Compare commits

...

10 Commits
3.6.0 ... 3.6.5

Author SHA1 Message Date
mintty
ab84d5bbde 3.6.5 2023-09-03 13:06:35 +02:00
mintty
943d83da69 add package check links for 3rd-party installers 2023-03-30 11:47:37 +02:00
mintty
0be30273f5 project page tweaks 2023-03-30 11:30:39 +02:00
mintty
e8177d77d7 2023-03-25 05:13:33 +01:00
mintty
756f5f5844 3.6.4 2023-03-25 04:58:07 +01:00
mintty
bbbef4fc89 install emoji deployment scripts 2023-03-24 10:09:49 +01:00
mintty
eee9516a23 3.6.1.2 build 2022-11-08 23:15:40 +01:00
mintty
449a310d90 update to wslbridge2 0.9 (to fix #302), drop patches;
update to mintty 3.6.1
2022-10-30 11:30:07 +01:00
mintty
87aa168b41 CI: install build environment 2022-04-01 00:05:05 +02:00
mintty
9de7d8d6f1 CI control file 2022-03-31 21:46:17 +02:00
7 changed files with 77 additions and 14 deletions

View File

@@ -1,4 +1,4 @@
mintty is copyright 2008-13 Andy Koppe, 2015-22 Thomas Wolff. mintty is copyright 2008-22 Andy Koppe, 2015-22 Thomas Wolff.
Licensed under the terms of the GNU General Public License version 3 or later, Licensed under the terms of the GNU General Public License version 3 or later,
amended with the bundling clause to clarify ambiguous interpretation. amended with the bundling clause to clarify ambiguous interpretation.

View File

@@ -11,6 +11,7 @@ WSLtty components
(“home”-located configuration files from a previously installed version (“home”-located configuration files from a previously installed version
will be migrated to the new default location) will be migrated to the new default location)
* Start Menu shortcuts to start WSL terminals * Start Menu shortcuts to start WSL terminals
* Desktop shorcut to start a terminal for the default WSL distribution
* `*.bat` scripts to invoke WSL terminals from the command line * `*.bat` scripts to invoke WSL terminals from the command line
* optional context menu entries for Windows Explorer to start WSL terminals in the respective folder * optional context menu entries for Windows Explorer to start WSL terminals in the respective folder
* install/uninstall context menu items from Start Menu subfolder `WSLtty` * install/uninstall context menu items from Start Menu subfolder `WSLtty`
@@ -78,6 +79,7 @@ Note: These are 3rd-party packages, not managed by this repository.
#### Windows Package Manager #### #### Windows Package Manager ####
([Check package](https://github.com/microsoft/winget-pkgs/tree/master/manifests/m/Mintty/WSLtty))
To install wsltty from the To install wsltty from the
[Windows Package Manager Community Repository](https://github.com/microsoft/winget-pkgs), [Windows Package Manager Community Repository](https://github.com/microsoft/winget-pkgs),
invoke one of invoke one of
@@ -86,6 +88,7 @@ invoke one of
#### Chocolatey #### #### Chocolatey ####
([Check package](https://community.chocolatey.org/packages/wsltty))
If you use the [Chocolatey package manager](https://chocolatey.org/), If you use the [Chocolatey package manager](https://chocolatey.org/),
invoke one of invoke one of
* `choco install wsltty` * `choco install wsltty`
@@ -93,6 +96,7 @@ invoke one of
#### Scoop #### #### Scoop ####
([Check package](https://scoop.sh/#/apps?q=wsltty))
If you use the [Scoop package manager](https://scoop.sh/), If you use the [Scoop package manager](https://scoop.sh/),
* `scoop bucket add extras` * `scoop bucket add extras`
@@ -113,7 +117,7 @@ To uninstall wsltty software completely, remove the installation folder manually
WSLtty can be invoked with WSLtty can be invoked with
* installed Start Menu shortcuts (or Desktop shortcuts if copied there) * installed Start Menu shortcuts (or Desktop shortcuts if copied there)
* *.bat scripts (optionally with WSL command as parameters) * *.bat scripts (optionally with WSL command as parameters) (see [Command line scripts](#command-line-scripts-wslbat) below)
* Explorer context menu (if installed from the Start Menu `WSLtty` subfolder) * Explorer context menu (if installed from the Start Menu `WSLtty` subfolder)
Starting the mintty terminal directly from the WSLtty installation location Starting the mintty terminal directly from the WSLtty installation location
@@ -174,7 +178,7 @@ from the Start Menu if desired.
The Start menu folder WSLtty contains the link The Start menu folder WSLtty contains the link
<img align=absmiddle height=25 src=https://user-images.githubusercontent.com/12740416/57078483-a7846a00-6cee-11e9-9c5e-8c2e9e56cae4.png>`configure WSL shortcuts`. <img align=absmiddle height=25 src=https://user-images.githubusercontent.com/12740416/57078483-a7846a00-6cee-11e9-9c5e-8c2e9e56cae4.png>`configure WSL shortcuts`.
This function is initially run when wsltty is installed. This function is initially run when wsltty is installed.
If should be rerun after adding or removing WSL distributions, It should be rerun after adding or removing WSL distributions,
in order to create the respective set of shortcuts in the Start menu. in order to create the respective set of shortcuts in the Start menu.
#### Command line scripts `wsl*.bat` #### #### Command line scripts `wsl*.bat` ####
@@ -241,6 +245,20 @@ Note:
If you define `HOME` at Windows level, this changes accordingly. If you define `HOME` at Windows level, this changes accordingly.
Note, however, that the WSL `$HOME` is a completely different setting. Note, however, that the WSL `$HOME` is a completely different setting.
#### Emoji deployment ####
Mintty and the wsltty package do not bundle actual emoji graphics but
there are scripts to support easy download and deployment.
If you have another instance of mintty installed (e.g. in cygwin)
and have emojis deployed already in the common config folder
`%APPDATA%\mintty\emojis`, they will be reused by wsltty.
To deploy emojis standalone for wsltty, use the scripts installed in
`%APPDATA%\wsltty\emojis` within WSL:
* `cd $(wslpath "$APPDATA/wsltty/emojis")`
* `getemojis` to provide emoji graphics as listed by Unicode.org
* `getflags` to provide emoji flag graphics (extending Unicode dynamically) from various sources
#### Shell selection and Login shell #### #### Shell selection and Login shell ####
The WSLtty deployment does not impose a shell preference; The WSLtty deployment does not impose a shell preference;

View File

@@ -1 +1 @@
3.6.0 3.6.5

31
appveyor.yml Normal file
View File

@@ -0,0 +1,31 @@
# This file is part of wsltty project
# Build image; of course wsltty has nothing to do with Visual Studio -
# this is just the name of Appveyor's build environment image
# that also contains cygwin
image: Visual Studio 2022
# Version format
version: "#{build}"
# Do not increment build number after pull requests
pull_requests:
do_not_increment_build_number: true
# Do not start a new build when a new Git tag is created
skip_tags: true
init:
- cmd: |
set PATH=C:\cygwin64;C:\cygwin64\bin;%windir%\System32
setup-x86_64 -q -P unzip -P zoo -P patch -P lcab
winget install Alpine
build_script:
- cmd: |
make
test_script:
- cmd: |
bin\mintty.exe --log mintty.log --exec echo hello mintty
grep echo mintty.log

View File

@@ -71,7 +71,7 @@ rem copy cygpopt-0.dll "%installdir%"\bin
rem copy cygiconv-2.dll "%installdir%"\bin rem copy cygiconv-2.dll "%installdir%"\bin
rem copy cygintl-8.dll "%installdir%"\bin rem copy cygintl-8.dll "%installdir%"\bin
rem create system config directory and copy config archive rem create system config directory and copy config archive and scripts
mkdir "%installdir%\usr\share\mintty\lang" 2> nul: mkdir "%installdir%\usr\share\mintty\lang" 2> nul:
copy lang.zoo "%installdir%\usr\share\mintty\lang" copy lang.zoo "%installdir%\usr\share\mintty\lang"
mkdir "%installdir%\usr\share\mintty\themes" 2> nul: mkdir "%installdir%\usr\share\mintty\themes" 2> nul:
@@ -83,6 +83,9 @@ copy charnames.txt "%installdir%\usr\share\mintty\info"
mkdir "%installdir%\usr\share\mintty\icon" 2> nul: mkdir "%installdir%\usr\share\mintty\icon" 2> nul:
copy tux.ico "%installdir%\usr\share\mintty\icon" copy tux.ico "%installdir%\usr\share\mintty\icon"
copy mintty.ico "%installdir%\usr\share\mintty\icon" copy mintty.ico "%installdir%\usr\share\mintty\icon"
mkdir "%installdir%\usr\share\mintty\emojis" 2> nul:
copy getemojis "%installdir%\usr\share\mintty\emojis" 2> nul:
copy getflags "%installdir%\usr\share\mintty\emojis" 2> nul:
rem create Start Menu Folder rem create Start Menu Folder
@@ -131,10 +134,13 @@ rmdir "%oldroot%\home" 2> nul:
:userconfig :userconfig
rem create user config directory and subfolders rem create user config directory and subfolders, copy scripts
mkdir "%configdir%\lang" 2> nul: mkdir "%configdir%\lang" 2> nul:
mkdir "%configdir%\themes" 2> nul: mkdir "%configdir%\themes" 2> nul:
mkdir "%configdir%\sounds" 2> nul: mkdir "%configdir%\sounds" 2> nul:
mkdir "%configdir%\emojis" 2> nul:
copy "%installdir%\usr\share\mintty\emojis\getemojis" "%configdir%\emojis" 2> nul:
copy "%installdir%\usr\share\mintty\emojis\getflags" "%configdir%\emojis" 2> nul:
rem create config file if it does not yet exist rem create config file if it does not yet exist
if exist "%configdir%\config" goto appconfig if exist "%configdir%\config" goto appconfig

View File

@@ -10,16 +10,16 @@
# wsltty release # wsltty release
ver=3.6.0 ver=3.6.5
# wsltty appx release - must have 4 parts! # wsltty appx release - must have 4 parts!
verx=3.6.0.0 verx=3.6.5.1
############################## ##############################
# mintty release version # mintty release version
minttyver=3.6.0 minttyver=3.6.5
############################## ##############################
@@ -27,7 +27,7 @@ minttyver=3.6.0
repo=Biswa96/wslbridge2 repo=Biswa96/wslbridge2
# wslbridge2 master release version # wslbridge2 master release version
wslbridgever=0.8 wslbridgever=0.11
# wslbridge2 latest version # wslbridge2 latest version
#archive=master #archive=master
@@ -148,10 +148,12 @@ $(wslbridgedir).zip:
wslbridge-source: $(wslbridgedir).zip wslbridge-source: $(wslbridgedir).zip
unzip -o $(wslbridgedir).zip unzip -o $(wslbridgedir).zip
cp $(wslbridgedir)/LICENSE LICENSE.wslbridge2 cp $(wslbridgedir)/LICENSE LICENSE.wslbridge2
# patch # the following two patches are obsolete with wslbridge2 v0.9
cd $(wslbridgedir); patch -p1 < ../0001-notify-size-change-inband.patch # patch to fix #220
# test case in mintty: (sleep 0.1; echo -e "\e[31;80t") & wslbridge2
#cd $(wslbridgedir); patch -p1 < ../0001-notify-size-change-inband.patch
# patch to https://github.com/Biswa96/wslbridge2/commit/41575379b416703c49e2687e957440239a4cdfb7 # patch to https://github.com/Biswa96/wslbridge2/commit/41575379b416703c49e2687e957440239a4cdfb7
cd $(wslbridgedir); patch -p0 < ../0002-add-com-for-lifted-wsl.patch #cd $(wslbridgedir); patch -p0 < ../0002-add-com-for-lifted-wsl.patch
wslbridge-frontend: wslbridge-source wslbridge-frontend: wslbridge-source
echo ------------- Compiling wslbridge2 frontend echo ------------- Compiling wslbridge2 frontend
@@ -214,7 +216,7 @@ mintty-pkg:
mintty-appx: mintty-appx:
mkdir -p usr/share/mintty mkdir -p usr/share/mintty
cd usr/share/mintty; mkdir -p lang themes sounds info cd usr/share/mintty; mkdir -p lang themes sounds info emojis
cp mintty-$(minttyver)/lang/*.po usr/share/mintty/lang/ cp mintty-$(minttyver)/lang/*.po usr/share/mintty/lang/
cp mintty-$(minttyver)/themes/*[!~] usr/share/mintty/themes/ cp mintty-$(minttyver)/themes/*[!~] usr/share/mintty/themes/
cp mintty-$(minttyver)/sounds/*.wav usr/share/mintty/sounds/ cp mintty-$(minttyver)/sounds/*.wav usr/share/mintty/sounds/
@@ -222,6 +224,7 @@ mintty-appx:
# add charnames.txt to support "Character Info" # add charnames.txt to support "Character Info"
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/
cp /usr/share/mintty/emojis/get*[!~] usr/share/mintty/emojis/
cygwin: # mkshortcutexe cygwin: # mkshortcutexe
mkdir -p bin mkdir -p bin
@@ -274,6 +277,7 @@ copcab: ver
cp *.bat $(CAB)/ cp *.bat $(CAB)/
cp config-distros.sh $(CAB)/ cp config-distros.sh $(CAB)/
cp mkshortcut.vbs $(CAB)/ cp mkshortcut.vbs $(CAB)/
cp mintty-$(minttyver)/tools/get*[!~] $(CAB)/
cop: copcab cop: copcab
mkdir -p rel mkdir -p rel

View File

@@ -61,6 +61,8 @@ FILE25="mkshortcut.vbs"
FILE26="dequote.bat" FILE26="dequote.bat"
FILE27="cmd2.bat" FILE27="cmd2.bat"
FILE28="install-portable.bat" FILE28="install-portable.bat"
FILE29="getemojis"
FILE30="getflags"
[SourceFiles] [SourceFiles]
SourceFiles0=. SourceFiles0=.
@@ -95,4 +97,6 @@ SourceFiles0=.
%FILE26%= %FILE26%=
%FILE27%= %FILE27%=
%FILE28%= %FILE28%=
%FILE29%=
%FILE30%=