Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use MACHTYPE instead of arch binary #588

Merged
merged 1 commit into from
Oct 31, 2023
Merged

fix: use MACHTYPE instead of arch binary #588

merged 1 commit into from
Oct 31, 2023

Conversation

pschmitt
Copy link
Member

@pschmitt pschmitt commented Oct 31, 2023

Description

arch command is not available for systems that do not have GNU coreutils installed. it isn't installed on Synology or NixOS for example.

Related Issue(s)

Closes #585

How Has This Been Tested?

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • Bug fix (non-breaking change which fixes an issue)
  • Documentation change
  • New feature (non-breaking change which adds functionality)

Checklist:

  • All new and existing tests passed.
  • I have added tests to cover my changes.
  • I have updated the documentation accordingly.

@@ -1557,7 +1557,7 @@ builtin source "${ZINIT[BIN_DIR]}/zinit-side.zsh" || {
local junk="(md5|sig|asc|txt|vsix|sum|sha256*|pkg|.(apk|deb|json|rpm|sh(#e)))"
filtered=( ${list[@]:#(#i)*${~junk}*} ) && (( $#filtered > 0 )) && list=( ${filtered[@]} )

local -a array=( $(print -rm "*($(arch)|${VENDOR}|)*~^*(${parts[1]}|${(L)$(uname)})*" $list[@]) )
local -a array=( $(print -rm "*(${MACHTYPE}|${VENDOR}|)*~^*(${parts[1]}|${(L)$(uname)})*" $list[@]) )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@vladdoster
Copy link
Member

Thanks @agross for reporting this and @pschmitt for the fix.

@vladdoster vladdoster merged commit bcf70e8 into main Oct 31, 2023
5 checks passed
@vladdoster vladdoster deleted the no-arch-bin branch October 31, 2023 16:39
github-actions bot pushed a commit that referenced this pull request Nov 20, 2023
## [3.12.1](v3.12.0...v3.12.1) (2023-11-20)

### Bug Fixes

* container zshelldoc install ([#591](#591)) ([8170753](8170753))
* from'gh-r' skips compile by default ([#590](#590)) ([1f52eee](1f52eee))
* respect delete flags after positional arguments ([#587](#587)) ([e18f9a7](e18f9a7))
* set home dir to test env in gh-r tests ([#582](#582)) ([9b33288](9b33288))
* use $MACHTYPE instead of arch command ([#588](#588)) ([bcf70e8](bcf70e8))
Copy link

🎉 This PR is included in version 3.12.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[bug]: arch binary is not available on Synology
2 participants