Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #3444 from lazka/fish-env-sync

Browse Source 
fish: sync /etc/fish/msystem.fish with bash variant
This commit is contained in:
Christoph Reiter 2022-12-20 09:04:26 +01:00 committed by GitHub
commit f6cb10ff8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fish/PKGBUILD
View File

@ -1,6 +1,6 @@
pkgname=fish
pkgver=3.5.1
pkgrel=1
pkgrel=2
epoch=
pkgdesc='Smart and user friendly shell intended mostly for interactive use'
arch=('i686' 'x86_64')
@ -22,7 +22,7 @@ sha512sums=('328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07
'SKIP'
'817195e2a6cdec1791b96666ee95f87f76569048268645a947f9283f711906fd3f2f5f1a4908b2b1edc0b9742215e0ac1c1cdaf10f9ec50d38b115fc05ae44b7'
'81d0a0b436a5a9dd2973e0de932833605c9f3fc57cc71ba32a15856e29b5192fa8ab450bb17d6f53636c8724327901a2d8ecd72fecb4afe120c258dcc581129d'
'13c512b5ea02bab2b81a502b0285c4c8b9654a45534138c71f079035d6cb90e39d960404ac111eb287ae7391ee6388ac3d97ed943961c8380066a9b2856ea307'
'64777bf41ba576506d45ffe4a5d7b5c47a026f519678f71ef1b08a7fad3d678faac23f3a695cea2869743bbbea85a26c97c11df5de6eb91c65304d5e43671201'
'a675062ebaf7da53845ba3a005d9f4b90c514c7eea2ead0f16592246925a00862afe7fd7326a86006f8d6077e02c3c37a87358105d4bb661001161bfd1788724')
validpgpkeys=('003837986104878835FA516D7A67D962D88A709A') # David Adam <zanchey@gmail.com>

21
fish/msystem.fish
View File

@ -12,8 +12,6 @@ set -e MINGW_CHOST
set -e MINGW_PREFIX
set -e MINGW_PACKAGE_PREFIX
set -e CONFIG_SITE
switch $MSYSTEM
case MINGW32
set -x MSYSTEM_PREFIX '/mingw32'
@ -22,7 +20,6 @@ switch $MSYSTEM
set -x MINGW_CHOST "$MSYSTEM_CHOST"
set -x MINGW_PREFIX "$MSYSTEM_PREFIX"
set -x MINGW_PACKAGE_PREFIX "mingw-w64-$MSYSTEM_CARCH"
set -x CONFIG_SITE "$MSYSTEM_PREFIX/etc/config.site"
case MINGW64
set -x MSYSTEM_PREFIX '/mingw64'
set -x MSYSTEM_CARCH 'x86_64'
@ -30,7 +27,6 @@ switch $MSYSTEM
set -x MINGW_CHOST "$MSYSTEM_CHOST"
set -x MINGW_PREFIX "$MSYSTEM_PREFIX"
set -x MINGW_PACKAGE_PREFIX "mingw-w64-$MSYSTEM_CARCH"
set -x CONFIG_SITE "$MSYSTEM_PREFIX/etc/config.site"
case CLANG32
set -x MSYSTEM_PREFIX '/clang32'
set -x MSYSTEM_CARCH 'i686'
@ -38,7 +34,6 @@ switch $MSYSTEM
set -x MINGW_CHOST "$MSYSTEM_CHOST"
set -x MINGW_PREFIX "$MSYSTEM_PREFIX"
set -x MINGW_PACKAGE_PREFIX "mingw-w64-clang-$MSYSTEM_CARCH"
set -x CONFIG_SITE "$MSYSTEM_PREFIX/etc/config.site"
case CLANG64
set -x MSYSTEM_PREFIX '/clang64'
set -x MSYSTEM_CARCH 'x86_64'
@ -46,10 +41,22 @@ switch $MSYSTEM
set -x MINGW_CHOST "$MSYSTEM_CHOST"
set -x MINGW_PREFIX "$MSYSTEM_PREFIX"
set -x MINGW_PACKAGE_PREFIX "mingw-w64-clang-$MSYSTEM_CARCH"
set -x CONFIG_SITE "$MSYSTEM_PREFIX/etc/config.site"
case CLANGARM64
set -x MSYSTEM_PREFIX '/clangarm64'
set -x MSYSTEM_CARCH 'aarch64'
set -x MSYSTEM_CHOST 'aarch64-w64-mingw32'
set -x MINGW_CHOST "$MSYSTEM_CHOST"
set -x MINGW_PREFIX "$MSYSTEM_PREFIX"
set -x MINGW_PACKAGE_PREFIX "mingw-w64-clang-$MSYSTEM_CARCH"
case UCRT64
set -x MSYSTEM_PREFIX '/ucrt64'
set -x MSYSTEM_CARCH 'x86_64'
set -x MSYSTEM_CHOST 'x86_64-w64-mingw32'
set -x MINGW_CHOST "$MSYSTEM_CHOST"
set -x MINGW_PREFIX "$MSYSTEM_PREFIX"
set -x MINGW_PACKAGE_PREFIX "mingw-w64-ucrt-$MSYSTEM_CARCH"
case '*'
set -x MSYSTEM_PREFIX '/usr'
set -x MSYSTEM_CARCH (/usr/bin/uname -m)
set -x MSYSTEM_CHOST (/usr/bin/uname -m)"-pc-msys"
set -x CONFIG_SITE "/etc/config.site"
end