From 6577f93f714a347f705ce62fd23927a59cbedca4 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 2 May 2014 12:59:38 -0500 Subject: [PATCH] Simplify HOMEBREW_LIBRARY_PATH usage --- Library/brew.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/brew.rb b/Library/brew.rb index 12ef026084..2803339437 100755 --- a/Library/brew.rb +++ b/Library/brew.rb @@ -11,8 +11,8 @@ if ARGV == %w{--prefix} end require 'pathname' -HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.dirname.parent.join("Library/Homebrew").to_s -$:.unshift(HOMEBREW_LIBRARY_PATH) +HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.dirname.parent.join("Library", "Homebrew") +$:.unshift(HOMEBREW_LIBRARY_PATH.to_s) require 'global' if ARGV.help? @@ -101,7 +101,7 @@ begin # Add contributed commands to PATH before checking. ENV['PATH'] += "#{File::PATH_SEPARATOR}#{HOMEBREW_CONTRIB}/cmd" - if require? HOMEBREW_REPOSITORY/"Library/Homebrew/cmd"/cmd + if require? HOMEBREW_LIBRARY_PATH.join("cmd", cmd) Homebrew.send cmd.to_s.gsub('-', '_').downcase elsif which "brew-#{cmd}" %w[CACHE CELLAR LIBRARY_PATH PREFIX REPOSITORY].each do |e|