aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorMarkus Reiter2017-04-25 19:04:00 +0200
committerMarkus Reiter2017-04-30 21:11:27 +0200
commit3e4fe279b04393d480432371ff73bbb893bfe7d8 (patch)
tree433526b65aa95721447b41dbb5d1b685ffd27a8e /Library/Homebrew
parent0c9047a2b81eaa58ccffa286a08df214a05f88ef (diff)
downloadbrew-3e4fe279b04393d480432371ff73bbb893bfe7d8.tar.bz2
Use `to_path_s` for `determine_pkg_config_libdir`.
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/extend/ENV.rb6
-rw-r--r--Library/Homebrew/extend/ENV/std.rb2
-rw-r--r--Library/Homebrew/extend/ENV/super.rb6
3 files changed, 7 insertions, 7 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index 283e90b69..811737f10 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -3,6 +3,12 @@ require "extend/ENV/shared"
require "extend/ENV/std"
require "extend/ENV/super"
+class Array
+ def to_path_s
+ map(&:to_s).uniq.select { |s| File.directory?(s) }.join(File::PATH_SEPARATOR).chuzzle
+ end
+end
+
def superenv?
ARGV.env != "std" && Superenv.bin
end
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index aafc0a451..d64f2185a 100644
--- a/Library/Homebrew/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/ENV/std.rb
@@ -62,7 +62,7 @@ module Stdenv
paths << "#{HOMEBREW_PREFIX}/share/pkgconfig"
paths += homebrew_extra_pkg_config_paths
paths << "/usr/lib/pkgconfig"
- paths.select { |d| File.directory? d }.join(File::PATH_SEPARATOR)
+ paths.to_path_s
end
# Removes the MAKEFLAGS environment variable, causing make to use a single job.
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index 4d6d96ad3..166973e09 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -330,10 +330,4 @@ module Superenv
end
end
-class Array
- def to_path_s
- map(&:to_s).uniq.select { |s| File.directory? s }.join(File::PATH_SEPARATOR).chuzzle
- end
-end
-
require "extend/os/extend/ENV/super"