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

utils/ruby.sh: make code more readable

Browse Source 
1. Repurpose 'vendor_ruby_current_version' variable:
   now this is not a pointer to a file but actual version number
2. Introduce 'vendor_ruby_latest_version' variable:
   it holds the value of the latest version of portable Ruby
This commit is contained in:
Maxim Belkin 2020-05-21 17:15:14 -05:00
parent db561eb7b9
commit 5d3456f485
No known key found for this signature in database
GPG Key ID: AC71560D4C5F2338
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,8 +7,9 @@ test-ruby () {
setup-ruby-path() { setup-ruby-path() {
local vendor_dir local vendor_dir
local vendor_ruby_current_version
local vendor_ruby_path local vendor_ruby_path
local vendor_ruby_latest_version
local vendor_ruby_current_version
local usable_ruby_version local usable_ruby_version
# When bumping check if HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH (in brew.sh) # When bumping check if HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH (in brew.sh)
# also needs to be changed. # also needs to be changed.
@ -22,8 +23,9 @@ If there's no Homebrew Portable Ruby available for your processor:
" "
vendor_dir="$HOMEBREW_LIBRARY/Homebrew/vendor" vendor_dir="$HOMEBREW_LIBRARY/Homebrew/vendor"
vendor_ruby_current_version="$vendor_dir/portable-ruby/current" vendor_ruby_path="$vendor_dir/portable-ruby/current/bin/ruby"
vendor_ruby_path="$vendor_ruby_current_version/bin/ruby" vendor_ruby_latest_version=$(<"$vendor_dir/portable-ruby-version")
vendor_ruby_current_version=$(readlink "$vendor_dir/portable-ruby/current")
unset HOMEBREW_RUBY_PATH unset HOMEBREW_RUBY_PATH
@ -35,8 +37,7 @@ If there's no Homebrew Portable Ruby available for your processor:
if [[ -x "$vendor_ruby_path" ]] if [[ -x "$vendor_ruby_path" ]]
then then
HOMEBREW_RUBY_PATH="$vendor_ruby_path" HOMEBREW_RUBY_PATH="$vendor_ruby_path"
if [[ $vendor_ruby_current_version != $vendor_ruby_latest_version ]]
if [[ $(readlink "$vendor_ruby_current_version") != "$(<"$vendor_dir/portable-ruby-version")" ]]
then then
if ! brew vendor-install ruby if ! brew vendor-install ruby
then then