Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

portable-ruby: fix installation on Leopard. #3208

Merged
merged 2 commits into from Sep 25, 2017
Merged

portable-ruby: fix installation on Leopard. #3208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
598ea0c
portable-ruby: fix installation on Leopard.
MikeMcQuaid Sep 25, 2017
dd75dd8
os/mac/version: allow leopard_64_or_later bottles.
MikeMcQuaid Sep 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions Library/Homebrew/cmd/vendor-install.sh
View file
Open in desktop
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions Library/Homebrew/os/mac/version.rb
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/utils/ruby.sh
View file
Open in desktop
Expand Up @@ -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" ]]
Expand Down