diff options
| author | Mike McQuaid | 2017-09-25 15:46:58 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2017-09-25 15:46:58 +0100 |
| commit | 598ea0cdece3646ce1c202862e01a4464180ed88 (patch) | |
| tree | 042ba5e1e82974ab900a0d5693285168a94ce84a | |
| parent | 3cd2373e2f961ad4c37109b518b13af81b865285 (diff) | |
| download | brew-598ea0cdece3646ce1c202862e01a4464180ed88.tar.bz2 | |
portable-ruby: fix installation on Leopard.
Download it insecurely there and require `rubygems` for `Gem::Version`.
| -rw-r--r-- | Library/Homebrew/cmd/vendor-install.sh | 5 | ||||
| -rw-r--r-- | Library/Homebrew/utils/ruby.sh | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/vendor-install.sh b/Library/Homebrew/cmd/vendor-install.sh index 227731244..2e99c3b46 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 813bb0999..9a3ab2e81 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" ]] |