diff options
| author | Xu Cheng | 2016-02-05 22:11:04 +0800 |
|---|---|---|
| committer | Xu Cheng | 2016-02-06 02:52:48 +0800 |
| commit | 12a452557d7695dba69f488a95a77a2650d28251 (patch) | |
| tree | a768def416e903df738e6dfad457713f7feed255 /Library/Homebrew | |
| parent | ca77025f8bb3e821c08a0b1d948ec5b0dc246fe1 (diff) | |
| download | brew-12a452557d7695dba69f488a95a77a2650d28251.tar.bz2 | |
make HOMEBREW_BREW_FILE a Pathname object
Currently HOMEBREW_BREW_FILE is a String, while other of HOMEBREW_*
variables are all Pathname. This commit unifies them all as Pathname,
so it will not cause any confusion.
Closes Homebrew/homebrew#48872.
Signed-off-by: Xu Cheng <xucheng@me.com>
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/config.rb | 5 | ||||
| -rw-r--r-- | Library/Homebrew/extend/fileutils.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/formula.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/test/lib/config.rb | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/Library/Homebrew/config.rb b/Library/Homebrew/config.rb index 98d75a8b8..63a703168 100644 --- a/Library/Homebrew/config.rb +++ b/Library/Homebrew/config.rb @@ -26,8 +26,9 @@ undef cache # Where brews installed via URL are cached HOMEBREW_CACHE_FORMULA = HOMEBREW_CACHE+"Formula" -HOMEBREW_BREW_FILE = ENV["HOMEBREW_BREW_FILE"] -unless HOMEBREW_BREW_FILE +if ENV["HOMEBREW_BREW_FILE"] + HOMEBREW_BREW_FILE = Pathname.new(ENV["HOMEBREW_BREW_FILE"]) +else odie "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!" end diff --git a/Library/Homebrew/extend/fileutils.rb b/Library/Homebrew/extend/fileutils.rb index 656579584..9717c69f2 100644 --- a/Library/Homebrew/extend/fileutils.rb +++ b/Library/Homebrew/extend/fileutils.rb @@ -17,8 +17,8 @@ module FileUtils # Reference from `man 2 open` # > When a new file is created, it is given the group of the directory which # contains it. - group_id = if File.grpowned? HOMEBREW_BREW_FILE - File.stat(HOMEBREW_BREW_FILE).gid + group_id = if HOMEBREW_BREW_FILE.grpowned? + HOMEBREW_BREW_FILE.stat.gid else Process.gid end diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index e807e2ce2..a1f3046cc 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -871,7 +871,7 @@ class Formula # @private def link_overwrite?(path) # Don't overwrite files not created by Homebrew. - return false unless path.stat.uid == File.stat(HOMEBREW_BREW_FILE).uid + return false unless path.stat.uid == HOMEBREW_BREW_FILE.stat.uid # Don't overwrite files belong to other keg except when that # keg's formula is deleted. begin diff --git a/Library/Homebrew/test/lib/config.rb b/Library/Homebrew/test/lib/config.rb index 527f2117f..cf9578544 100644 --- a/Library/Homebrew/test/lib/config.rb +++ b/Library/Homebrew/test/lib/config.rb @@ -1,7 +1,7 @@ require "tmpdir" require "pathname" -HOMEBREW_BREW_FILE = ENV["HOMEBREW_BREW_FILE"] +HOMEBREW_BREW_FILE = Pathname.new(ENV["HOMEBREW_BREW_FILE"]) HOMEBREW_TEMP = Pathname.new(ENV["HOMEBREW_TEMP"] || Dir.tmpdir) TEST_TMPDIR = ENV.fetch("HOMEBREW_TEST_TMPDIR") { |k| |