zsh/zdharma-continuum.zinit
1
0
Fork 0
mirror of https://github.com/zdharma-continuum/zinit.git synced 2026-09-10 07:36:38 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: gh-r pattern for 64bit linux-gnu systems

Browse source 
Signed-off-by: Vladislav Doster <mvdoster@gmail.com>
This commit is contained in:
Vladislav Doster 2023-01-14 00:01:00 +00:00
parent 52e112c7c3
commit b5a31c07f2
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.github/workflows/tests.yaml vendored
View file

@ -38,17 +38,12 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: install homebrew - name: install homebrew
id: set-up-homebrew id: setup-homebrew
uses: Homebrew/actions/setup-homebrew@master uses: Homebrew/actions/setup-homebrew@master
- name: "install musl" # - name: "install musl"
if: runner.os == 'Linux' # if: runner.os == 'Linux'
run: | # run: sudo apt-get install build-essential curl file gcc gcc-multilib glibc-source libc6 libc6-dev unzip xz-utils zsh
sudo apt-get update \
&& sudo apt-get install \
build-essential curl file gcc gcc-multilib glibc-source \
libc6 libc6-dev \
musl musl-dev musl-tools unzip zsh
- name: "install dependencies" - name: "install dependencies"
id: install-deps id: install-deps

2
doc/zsdoc/zinit-install.zsh.adoc
View file

@ -278,7 +278,7 @@ ____
package. Connects to Github releases page. package. Connects to Github releases page.
____ ____
Has 48 line(s). Calls functions: Has 52 line(s). Calls functions:
.zinit-get-latest-gh-r-url-part .zinit-get-latest-gh-r-url-part
`-- zinit.zsh/+zinit-message `-- zinit.zsh/+zinit-message

14
zinit-install.zsh
View file

@ -1484,7 +1484,7 @@ builtin source "${ZINIT[BIN_DIR]}/zinit-side.zsh" || {
.zi::get-architecture () { .zi::get-architecture () {
emulate -LR zsh emulate -LR zsh
setopt extendedglob noshortloops nowarncreateglobal rcquotes typesetsilent setopt extendedglob noshortloops nowarncreateglobal rcquotes typesetsilent
local _arch="$(arch)" _clib="gnu" _cpu="$(uname -m)" _os="$(uname -s)" _sys="" local _clib="gnu" _cpu="$(uname -m)" _os="$(uname -s)" _sys=""
case "$_os" in case "$_os" in
(Darwin) (Darwin)
_sys='(apple|darwin|apple-darwin|dmg|mac((-|)os|)|os(-|64|)x)' _sys='(apple|darwin|apple-darwin|dmg|mac((-|)os|)|os(-|64|)x)'
@ -1495,9 +1495,9 @@ builtin source "${ZINIT[BIN_DIR]}/zinit-side.zsh" || {
;; ;;
(Linux) (Linux)
if [[ -n /lib/*musl*(#qN) ]] || (( ${+commands[musl-gcc]} )); then if [[ -n /lib/*musl*(#qN) ]] || (( ${+commands[musl-gcc]} )); then
_sys='((unknown-|)linux-(gnu|musl))' _sys='(linux[\-\_])*~^*((gnu|musl)[\-\_\.])'
else else
_sys="(unknown-|)linux-gnu" _sys='(linux[\-\_])*~^*(gnu[\-\_\.])'
fi fi
;; ;;
(MINGW* | MSYS* | CYGWIN* | Windows_NT) (MINGW* | MSYS* | CYGWIN* | Windows_NT)
@ -1567,8 +1567,12 @@ builtin source "${ZINIT[BIN_DIR]}/zinit-side.zsh" || {
filtered=( ${list[@]:#(#i)*${~junk}*} ) && (( $#filtered > 0 )) && list=( ${filtered[@]} ) filtered=( ${list[@]:#(#i)*${~junk}*} ) && (( $#filtered > 0 )) && list=( ${filtered[@]} )
for part in "${parts[@]}"; do for part in "${parts[@]}"; do
if (( $#list > 1 )) { filtered=( ${(M)list[@]:#(#i)*${~part}*} ) && (( $#filtered > 0 )) && list=( ${filtered[@]} ) } if (( $#list > 1 )); then
# +zinit-message "{info}[{pre}gh-r{info}]{rst} filter -> {glob}${part}{rst}{nl} - ${(@pj:\n - :)list[1,2]}{nl}" filtered=( ${(M)list[@]:#(#i)*${~part}*} ) && (( $#filtered > 0 )) && list=( ${filtered[@]} )
# +zinit-message "{info}[{pre}gh-r{info}]{rst} filter -> {glob}${part}{rst}{nl} - ${(@pj:\n - :)list[1,2]}{nl}"
else
break
fi
done done
if (( $#list > 1 )) { filtered=( ${list[@]:#(#i)*.(sha[[:digit:]]#|asc)} ) && (( $#filtered > 0 )) && list=( ${filtered[@]} ); } if (( $#list > 1 )) { filtered=( ${list[@]:#(#i)*.(sha[[:digit:]]#|asc)} ) && (( $#filtered > 0 )) && list=( ${filtered[@]} ); }