Merge pull request #461 from zdharma-continuum/fix/update-linux-pattern

fix: gh-r pattern for x86_64 linux-gnu systems

Author: vladdoster

.github/workflows/tests.yaml

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

doc/zsdoc/zinit-install.zsh.adoc

@@ -278,7 +278,7 @@ ____
  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.zsh/+zinit-message

zinit-install.zsh

@@ -1484,7 +1484,7 @@ builtin source "${ZINIT[BIN_DIR]}/zinit-side.zsh" || {
 .zi::get-architecture () {
   emulate -LR zsh
   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
     (Darwin)
       _sys='(apple|darwin|apple-darwin|dmg|mac((-|)os|)|os(-|64|)x)'
@@ -1495,9 +1495,9 @@ builtin source "${ZINIT[BIN_DIR]}/zinit-side.zsh" || {
       ;;
     (Linux)
       if [[ -n /lib/*musl*(#qN) ]] || (( ${+commands[musl-gcc]} )); then
-        _sys='((unknown-|)linux-(gnu|musl))'
+        _sys='(linux[\-\_])*~^*((gnu|musl)[\-\_\.])'
       else
-        _sys="(unknown-|)linux-gnu"
+        _sys='(linux[\-\_])*~^*(gnu[\-\_\.])'
       fi
       ;;
     (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[@]} )
 
     for part in "${parts[@]}"; do
-      if (( $#list > 1 )) { 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}"
+      if (( $#list > 1 )); then
+        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
 
     if (( $#list > 1 )) { filtered=( ${list[@]:#(#i)*.(sha[[:digit:]]#|asc)} ) && (( $#filtered > 0 )) && list=( ${filtered[@]} ); }