From 4a5462cfa8fa641a14499d34cb0af76f65e83aed Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 3 Jun 2014 10:14:58 -0500 Subject: [PATCH] Switch to "Current" Ruby framework symlink Closes Homebrew/homebrew#29795. Closes Homebrew/homebrew#29819. --- Library/Contributions/cmd/brew-server | 2 +- Library/ENV/4.3/cc | 4 ++-- Library/brew.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Contributions/cmd/brew-server b/Library/Contributions/cmd/brew-server index e51817b6a3..c8f3b31181 100755 --- a/Library/Contributions/cmd/brew-server +++ b/Library/Contributions/cmd/brew-server @@ -1,4 +1,4 @@ -#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +#!/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby ## brew server: Run a local webserver for browsing available and installed brews. # Note: this external command is ruby, but set up as a shell script, so that it gets exec'd. diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc index 06a504da1a..36a8be8c6e 100755 --- a/Library/ENV/4.3/cc +++ b/Library/ENV/4.3/cc @@ -1,6 +1,6 @@ -#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -W0 +#!/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby -W0 -$:.unshift "/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8" +$:.unshift Dir["/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/lib/ruby/{1.8,2.0.0}"].first require 'pathname' require 'set' require 'stringio' diff --git a/Library/brew.rb b/Library/brew.rb index 60c3109f0a..9064cacdb6 100755 --- a/Library/brew.rb +++ b/Library/brew.rb @@ -1,4 +1,4 @@ -#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -W0 +#!/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby -W0 # encoding: UTF-8 std_trap = trap("INT") { exit! 130 } # no backtrace thanks