diff options
| author | Mike McQuaid | 2017-09-25 19:18:16 +0100 |
|---|---|---|
| committer | GitHub | 2017-09-25 19:18:16 +0100 |
| commit | 880f980f4eced68b7cb1da53e1e7591f42bafb64 (patch) | |
| tree | db6166c0c41584da8804d720fcdbc3a8519fbe69 | |
| parent | 46e6e9911acb34b2931cac4b95befeaa27ebd12f (diff) | |
| parent | dd75dd8a25b6e60b4f87c2220335e5bd37b9cc0f (diff) | |
| download | brew-880f980f4eced68b7cb1da53e1e7591f42bafb64.tar.bz2 | |
Merge pull request #3208 from MikeMcQuaid/more-leopard-fixes
portable-ruby: fix installation on Leopard.
| -rw-r--r-- | Library/Homebrew/cmd/vendor-install.sh | 5 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/version.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/utils/ruby.sh | 2 |
3 files changed, 7 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/os/mac/version.rb b/Library/Homebrew/os/mac/version.rb index 89016bb4d..db6dfcb1a 100644 --- a/Library/Homebrew/os/mac/version.rb +++ b/Library/Homebrew/os/mac/version.rb @@ -12,6 +12,7 @@ module OS mountain_lion: "10.8", lion: "10.7", snow_leopard: "10.6", + leopard_64: "10.5", leopard: "10.5", tiger: "10.4", }.freeze 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" ]] |