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

shims/linux/super/cc: Factor out remove_superbin_from_path

Browse Source
This commit is contained in:
Shaun Jackman 2018-05-22 11:16:03 -07:00
parent c507408fd4
commit d587177fef
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/shims/linux/super/cc
View File

@ -331,6 +331,14 @@ def log(basename, argv, tool, args)
File.open("#{ENV["HOMEBREW_CC_LOG_PATH"]}.cc", "a+") { |f| f.write(s) } File.open("#{ENV["HOMEBREW_CC_LOG_PATH"]}.cc", "a+") { |f| f.write(s) }
end end
def remove_superbin_from_path(paths)
superbin = Pathname.new(__FILE__).dirname.realpath
paths.reject do |x|
path = Pathname.new(x)
path.directory? && path.realpath == superbin
end
end
if __FILE__ == $PROGRAM_NAME if __FILE__ == $PROGRAM_NAME
##################################################################### sanity ##################################################################### sanity
@ -349,11 +357,8 @@ if __FILE__ == $PROGRAM_NAME
log(basename, ARGV, tool, args) log(basename, ARGV, tool, args)
superbin = Pathname.new(__FILE__).dirname.realpath paths = ENV["PATH"].split(":")
paths = ENV["PATH"].split(":").reject do |x| paths = remove_superbin_from_path(paths)
path = Pathname.new(x)
path.directory? && path.realpath == superbin
end
paths.unshift "#{ENV["HOMEBREW_PREFIX"]}/bin" paths.unshift "#{ENV["HOMEBREW_PREFIX"]}/bin"
ENV["PATH"] = paths.join(":") ENV["PATH"] = paths.join(":")
args << { :close_others => false } args << { :close_others => false }