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

Merge pull request #3208 from MikeMcQuaid/more-leopard-fixes

Browse Source 
portable-ruby: fix installation on Leopard.
This commit is contained in:
Mike McQuaid 2017-09-25 19:18:16 +01:00 committed by GitHub
commit 880f980f4e
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,11 @@ fetch() {
curl_args[${#curl_args[*]}]="--progress-bar" curl_args[${#curl_args[*]}]="--progress-bar"
fi fi
if [[ "$HOMEBREW_MACOS_VERSION_NUMERIC" -lt "100600" ]]
then
curl_args[${#curl_args[*]}]="--insecure"
fi
temporary_path="$CACHED_LOCATION.incomplete" temporary_path="$CACHED_LOCATION.incomplete"
mkdir -p "$HOMEBREW_CACHE" mkdir -p "$HOMEBREW_CACHE"

1
Library/Homebrew/os/mac/version.rb
View File

@ -12,6 +12,7 @@ module OS
mountain_lion: "10.8", mountain_lion: "10.8",
lion: "10.7", lion: "10.7",
snow_leopard: "10.6", snow_leopard: "10.6",
leopard_64: "10.5",
leopard: "10.5", leopard: "10.5",
tiger: "10.4", tiger: "10.4",
}.freeze }.freeze

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

@ -37,7 +37,7 @@ setup-ruby-path() {
if [[ -n "$HOMEBREW_RUBY_PATH" ]] if [[ -n "$HOMEBREW_RUBY_PATH" ]]
then 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 fi
if [[ "$ruby_old_version" == "true" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]] if [[ "$ruby_old_version" == "true" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]]