From 6b18d5572dd93d9bdde1786d6f7c457d01421dc7 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Sat, 7 Nov 2009 18:08:26 +0000 Subject: [PATCH] Rename BREW_FILE HOMEBREW_BREW_FILE Because it's a global.h constant and that file can be included by other projects. --- Library/Homebrew/global.rb | 4 ++-- Library/Homebrew/install.rb | 2 +- bin/brew | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 8b9aba4b25..52f3dd6a86 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -38,8 +38,8 @@ else HOMEBREW_CACHE=Pathname.new("~/Library/Caches/Homebrew").expand_path end -HOMEBREW_PREFIX = Pathname.new(BREW_FILE).dirname.parent # Where we link under -HOMEBREW_REPOSITORY = Pathname.new(BREW_FILE).realpath.dirname.parent # Where .git is found +HOMEBREW_PREFIX = Pathname.new(HOMEBREW_BREW_FILE).dirname.parent # Where we link under +HOMEBREW_REPOSITORY = Pathname.new(HOMEBREW_BREW_FILE).realpath.dirname.parent # Where .git is found # Where should be build to? # If /usr/local/Cellar exists, as a symlink or real folder, use that. diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb index 3c7ca6c90c..887705e707 100755 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -1,5 +1,5 @@ #!/usr/bin/ruby -BREW_FILE = `which brew`.strip +HOMEBREW_BREW_FILE = `which brew`.strip require 'global' diff --git a/bin/brew b/bin/brew index 024034ab42..57352b4a14 100755 --- a/bin/brew +++ b/bin/brew @@ -5,7 +5,7 @@ # odd exceptions. Reduce our support burden by showing a user-friendly error. Dir.getwd rescue abort "The current working directory doesn't exist, cannot proceed." -BREW_FILE = File.expand_path __FILE__ +HOMEBREW_BREW_FILE = File.expand_path __FILE__ def homebrew_rubylib_path lib_path = "/../../Library/Homebrew"