From 598ea0cdece3646ce1c202862e01a4464180ed88 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 25 Sep 2017 15:46:58 +0100 Subject: [PATCH 1/2] portable-ruby: fix installation on Leopard. Download it insecurely there and require `rubygems` for `Gem::Version`. --- Library/Homebrew/cmd/vendor-install.sh | 5 +++++ Library/Homebrew/utils/ruby.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/vendor-install.sh b/Library/Homebrew/cmd/vendor-install.sh index 2277312443f61..2e99c3b46620e 100644 --- a/Library/Homebrew/cmd/vendor-install.sh +++ b/Library/Homebrew/cmd/vendor-install.sh @@ -45,6 +45,11 @@ fetch() { curl_args[${#curl_args[*]}]="--progress-bar" fi + if [[ "$HOMEBREW_MACOS_VERSION_NUMERIC" -lt "100600" ]] + then + curl_args[${#curl_args[*]}]="--insecure" + fi + temporary_path="$CACHED_LOCATION.incomplete" mkdir -p "$HOMEBREW_CACHE" diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh index 813bb09999901..9a3ab2e81880e 100644 --- a/Library/Homebrew/utils/ruby.sh +++ b/Library/Homebrew/utils/ruby.sh @@ -37,7 +37,7 @@ setup-ruby-path() { if [[ -n "$HOMEBREW_RUBY_PATH" ]] then - ruby_old_version="$("$HOMEBREW_RUBY_PATH" -e "puts Gem::Version.new('$minimum_ruby_version') > Gem::Version.new(RUBY_VERSION)")" + ruby_old_version="$("$HOMEBREW_RUBY_PATH" -rrubygems -e "puts Gem::Version.new('$minimum_ruby_version') > Gem::Version.new(RUBY_VERSION)")" fi if [[ "$ruby_old_version" == "true" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]] From dd75dd8a25b6e60b4f87c2220335e5bd37b9cc0f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 25 Sep 2017 18:35:18 +0100 Subject: [PATCH 2/2] os/mac/version: allow leopard_64_or_later bottles. --- Library/Homebrew/os/mac/version.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/os/mac/version.rb b/Library/Homebrew/os/mac/version.rb index 89016bb4d10dc..db6dfcb1a6922 100644 --- a/Library/Homebrew/os/mac/version.rb +++ b/Library/Homebrew/os/mac/version.rb @@ -12,6 +12,7 @@ class Version < ::Version mountain_lion: "10.8", lion: "10.7", snow_leopard: "10.6", + leopard_64: "10.5", leopard: "10.5", tiger: "10.4", }.freeze