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

extend/ENV/shared: fix Rubocop warnings.

Browse Source
This commit is contained in:
Mike McQuaid 2016-09-11 17:53:00 +01:00
parent 17a7c23881
commit fe661a809c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/extend/ENV/shared.rb
View File

@ -12,9 +12,9 @@ module SharedEnvExtension
include CompilerConstants include CompilerConstants
# @private # @private
CC_FLAG_VARS = %w[CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS] CC_FLAG_VARS = %w[CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS].freeze
# @private # @private
FC_FLAG_VARS = %w[FCFLAGS FFLAGS] FC_FLAG_VARS = %w[FCFLAGS FFLAGS].freeze
# @private # @private
SANITIZED_VARS = %w[ SANITIZED_VARS = %w[
CDPATH GREP_OPTIONS CLICOLOR_FORCE CDPATH GREP_OPTIONS CLICOLOR_FORCE
@ -25,7 +25,7 @@ module SharedEnvExtension
CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_FRAMEWORK_PATH CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_FRAMEWORK_PATH
GOBIN GOPATH GOROOT PERL_MB_OPT PERL_MM_OPT GOBIN GOPATH GOROOT PERL_MB_OPT PERL_MM_OPT
LIBRARY_PATH LIBRARY_PATH
] ].freeze
# @private # @private
def setup_build_environment(formula = nil) def setup_build_environment(formula = nil)
@ -193,13 +193,19 @@ module SharedEnvExtension
def userpaths! def userpaths!
paths = self["PATH"].split(File::PATH_SEPARATOR) paths = self["PATH"].split(File::PATH_SEPARATOR)
# put Superenv.bin and opt path at the first # put Superenv.bin and opt path at the first
new_paths = paths.select { |p| p.start_with?("#{HOMEBREW_REPOSITORY}/Library/ENV") || p.start_with?("#{HOMEBREW_PREFIX}/opt") } new_paths = paths.select { |p| p.start_with?("#{HOMEBREW_REPOSITORY}/Library/ENV", "#{HOMEBREW_PREFIX}/opt") }
# XXX hot fix to prefer brewed stuff (e.g. python) over /usr/bin. # XXX hot fix to prefer brewed stuff (e.g. python) over /usr/bin.
new_paths << "#{HOMEBREW_PREFIX}/bin" new_paths << "#{HOMEBREW_PREFIX}/bin"
# reset of self["PATH"] # reset of self["PATH"]
new_paths += paths new_paths += paths
# user paths # user paths
new_paths += ORIGINAL_PATHS.map { |p| p.realpath.to_s rescue nil } - %w[/usr/X11/bin /opt/X11/bin] new_paths += ORIGINAL_PATHS.map do |p|
begin
p.realpath.to_s
rescue
nil
end
end - %w[/usr/X11/bin /opt/X11/bin]
self["PATH"] = new_paths.uniq.join(File::PATH_SEPARATOR) self["PATH"] = new_paths.uniq.join(File::PATH_SEPARATOR)
end end