admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #7476 from MikeMcQuaid/improve-portable-ruby-messaging

Browse Source 
Improve Homebrew Portable Ruby messaging
This commit is contained in:
Mike McQuaid 2020-05-02 14:15:15 +01:00 committed by GitHub
commit 677b987903
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/cmd/vendor-install.sh
View File

@ -144,7 +144,7 @@ EOS
EOSCRIPT
)"
else
odie "Cannot verify the checksum ('shasum' or 'sha256sum' not found)!"
odie "Cannot verify checksum ('shasum' or 'sha256sum' not found)!"
fi
if [[ "$sha" != "$VENDOR_SHA" ]]
@ -197,7 +197,7 @@ install() {
then
mv "$VENDOR_VERSION.reinstall" "$VENDOR_VERSION"
fi
odie "Failed to vendor $VENDOR_NAME $VENDOR_VERSION."
odie "Failed to install $VENDOR_NAME $VENDOR_VERSION!"
fi
trap - SIGINT
@ -222,13 +222,13 @@ homebrew-vendor-install() {
[[ "$option" = *d* ]] && HOMEBREW_DEBUG=1
;;
*)
[[ -n "$VENDOR_NAME" ]] && odie "This command does not take multiple vendor targets"
[[ -n "$VENDOR_NAME" ]] && odie "This command does not take multiple vendor targets!"
VENDOR_NAME="$option"
;;
esac
done
[[ -z "$VENDOR_NAME" ]] && odie "This command requires one vendor target."
[[ -z "$VENDOR_NAME" ]] && odie "This command requires a vendor target!"
[[ -n "$HOMEBREW_DEBUG" ]] && set -x
url_var="${VENDOR_NAME}_URL"
@ -237,16 +237,13 @@ homebrew-vendor-install() {
VENDOR_URL="${!url_var}"
VENDOR_URL2="${!url2_var}"
VENDOR_SHA="${!sha_var}"
VENDOR_VERSION="$(<"$VENDOR_DIR/portable-$VENDOR_NAME-version")"
if [[ -z "$VENDOR_URL" || -z "$VENDOR_SHA" ]]
then
odie <<-EOS
Cannot find a vendored version of $VENDOR_NAME for your $HOMEBREW_PROCESSOR
processor on $HOMEBREW_PRODUCT!
EOS
odie "No Homebrew $VENDOR_NAME $VENDOR_VERSION available for $HOMEBREW_PROCESSOR processors!"
fi
VENDOR_VERSION="$(<"$VENDOR_DIR/portable-$VENDOR_NAME-version")"
CACHED_LOCATION="$HOMEBREW_CACHE/$(basename "$VENDOR_URL")"
lock "vendor-install-$VENDOR_NAME"

26
Library/Homebrew/utils/ruby.sh
View File

@ -26,7 +26,18 @@ setup-ruby-path() {
then
if ! brew vendor-install ruby
then
onoe "Failed to upgrade vendor Ruby."
if [[ -n "$HOMEBREW_MACOS" ]]
then
odie "Failed to upgrade Homebrew Portable Ruby!"
else
odie <<-EOS
Failed to upgrade Homebrew Portable Ruby!
If there's no Homebrew Portable Ruby available for your processor:
- install Ruby $required_ruby_version with your system package manager (or rbenv/ruby-build)
- make it first in your PATH
- try again
EOS
fi
fi
fi
else
@ -50,7 +61,18 @@ setup-ruby-path() {
brew vendor-install ruby
if [[ ! -x "$vendor_ruby_path" ]]
then
odie "Failed to install vendor Ruby."
if [[ -n "$HOMEBREW_MACOS" ]]
then
odie "Failed to install Homebrew Portable Ruby (and your system version is too old)!"
else
odie <<-EOS
Failed to install Homebrew Portable Ruby and cannot find another Ruby $required_ruby_version!
If there's no Homebrew Portable Ruby available for your processor:
- install $required_ruby_version with your system package manager (or rbenv/ruby-build)
- make it first in your PATH
- try again
EOS
fi
fi
HOMEBREW_RUBY_PATH="$vendor_ruby_path"
fi

2
docs/Homebrew-on-Linux.md
View File

@ -68,6 +68,8 @@ sudo yum install libxcrypt-compat # needed by Fedora 30 and up
Homebrew can run on 32-bit ARM (Raspberry Pi and others) and 64-bit ARM (AArch64), but no binary packages (bottles) are available. Support for ARM is on a best-effort basis. Pull requests are welcome to improve the experience on ARM platforms.
You may need to install your own Ruby using your system package manager, a PPA, or `rbenv/ruby-build` as in the future we will no longer distribute a Homebrew Portable Ruby for ARM.
### 32-bit x86
Homebrew does not currently support 32-bit x86 platforms. It would be possible for Homebrew to work on 32-bit x86 platforms with some effort. An interested and dedicated person could maintain a fork of Homebrew to develop support for 32-bit x86.