From 144453368ed42c13e24143dd4e234795eb67f3cb Mon Sep 17 00:00:00 2001
From: Xu Cheng <xucheng@me.com>
Date: Thu, 5 Mar 2015 18:05:07 +0800
Subject: [PATCH] test-bot pathname: use Utils.popen_read instead of backticks
Closes Homebrew/homebrew#37418.
Signed-off-by: Xu Cheng <xucheng@me.com>
---
Library/Homebrew/cmd/test-bot.rb | 8 ++++----
Library/Homebrew/extend/pathname.rb | 7 ++++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index 44672dd58a..44b67574bd 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -365,12 +365,12 @@ module Homebrew
end
test "brew", "uses", canonical_formula_name
- dependencies = `brew deps #{canonical_formula_name}`.split("\n")
- dependencies -= `brew list`.split("\n")
+ dependencies = Utils.popen_read("brew", "deps", canonical_formula_name).split("\n")
+ dependencies -= Utils.popen_read("brew", "list").split("\n")
unchanged_dependencies = dependencies - @formulae
changed_dependences = dependencies - unchanged_dependencies
- dependents = `brew uses --skip-build --skip-optional #{canonical_formula_name}`.split("\n")
+ dependents = Utils.popen_read("brew", "uses", "--skip-build", "--skip-optional", canonical_formula_name).split("\n")
dependents -= @formulae
dependents = dependents.map {|d| Formulary.factory(d)}
@@ -573,7 +573,7 @@ module Homebrew
non_dependencies = []
@formulae.each do |formula|
- formula_dependencies = `brew deps #{formula}`.split("\n")
+ formula_dependencies = Utils.popen_read("brew", "deps", formula).split("\n")
unchanged_dependencies = formula_dependencies - @formulae
changed_dependences = formula_dependencies - unchanged_dependencies
changed_dependences.each do |changed_formula|
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 2ca8b6e5f0..6e7a8ef582 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -413,10 +413,11 @@ class Pathname
end
def abv
- out=''
- n=`find #{to_s} -type f ! -name .DS_Store | wc -l`.to_i
+ out = ""
+ n = Utils.popen_read("find", expand_path.to_s, "-type", "f", "!", "-name", ".DS_Store").split("\n").size
out << "#{n} files, " if n > 1
- out << `/usr/bin/du -hs #{to_s} | cut -d"\t" -f1`.strip
+ out << Utils.popen_read("/usr/bin/du", "-hs", expand_path.to_s).split("\t")[0]
+ out
end
# We redefine these private methods in order to add the /o modifier to
--
GitLab