aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorJack Nagel2014-04-25 18:58:16 -0500
committerJack Nagel2014-04-25 18:58:16 -0500
commit35fb78a1c82b6ca3f8cbfd63a8ba4e5d70fdb3ae (patch)
treee6b1f24f64f202d02811ffff26ebf8581f1d71ca /Library/Homebrew/cmd
parent52988fb6350c351323cc77e99577eca9bf955e57 (diff)
downloadhomebrew-35fb78a1c82b6ca3f8cbfd63a8ba4e5d70fdb3ae.tar.bz2
Yield absolute paths from find_formula
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/search.rb4
-rw-r--r--Library/Homebrew/cmd/tap.rb4
-rw-r--r--Library/Homebrew/cmd/untap.rb2
3 files changed, 5 insertions, 5 deletions
diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index 991ca58b8..f729937f1 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -32,8 +32,8 @@ module Homebrew extend self
if tap_dir.directory?
result = ""
if query
- tap_dir.find_formula do |child|
- basename = child.basename(".rb").to_s
+ tap_dir.find_formula do |file|
+ basename = file.basename(".rb").to_s
result = basename if basename == query
end
end
diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb
index 0c15b4ac5..15ebacb61 100644
--- a/Library/Homebrew/cmd/tap.rb
+++ b/Library/Homebrew/cmd/tap.rb
@@ -25,7 +25,7 @@ module Homebrew extend self
abort unless system "git clone https://github.com/#{repouser}/homebrew-#{repo} #{tapd}"
files = []
- tapd.find_formula { |file| files << tapd.join(file) }
+ tapd.find_formula { |file| files << file }
link_tap_formula(files)
puts "Tapped #{files.length} formula"
@@ -85,7 +85,7 @@ module Homebrew extend self
# check symlinks are all set in each tap
each_tap do |user, repo|
files = []
- repo.find_formula { |file| files << repo.join(file) }
+ repo.find_formula { |file| files << file }
count += link_tap_formula(files)
end
diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb
index bbb223238..bba10b07a 100644
--- a/Library/Homebrew/cmd/untap.rb
+++ b/Library/Homebrew/cmd/untap.rb
@@ -18,7 +18,7 @@ module Homebrew extend self
raise "No such tap!" unless tapd.directory?
files = []
- tapd.find_formula { |file| files << tapd.join(file) }
+ tapd.find_formula { |file| files << file }
unlink_tap_formula(files)
tapd.rmtree
tapd.dirname.rmdir_if_possible