diff options
| author | Mike McQuaid | 2017-12-14 20:15:15 +0000 |
|---|---|---|
| committer | GitHub | 2017-12-14 20:15:15 +0000 |
| commit | 0cbe1f3a0516261acb8be339c5a9511be92d3ed7 (patch) | |
| tree | 23e6227995ae0a2c4816efec6b8752d54233c96a /Library | |
| parent | c912d268f17901044c2012683c11e2adcf260cf2 (diff) | |
| parent | 8410950d14f7666854a6f94aa24d31b59892465c (diff) | |
| download | brew-0cbe1f3a0516261acb8be339c5a9511be92d3ed7.tar.bz2 | |
Merge pull request #3579 from MikeMcQuaid/gist-logs-full-path
gist-logs: use full path to brew.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/gist-logs.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/dev-cmd/bump-formula-pr.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/requirements/java_requirement.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/gist-logs.rb b/Library/Homebrew/cmd/gist-logs.rb index 45537602b..9c0302813 100644 --- a/Library/Homebrew/cmd/gist-logs.rb +++ b/Library/Homebrew/cmd/gist-logs.rb @@ -27,7 +27,7 @@ module Homebrew # Dummy summary file, asciibetically first, to control display title of gist files["# #{f.name} - #{timestamp}.txt"] = { content: brief_build_info(f) } files["00.config.out"] = { content: s.string } - files["00.doctor.out"] = { content: `brew doctor 2>&1` } + files["00.doctor.out"] = { content: Utils.popen_read("#{HOMEBREW_PREFIX}/bin/brew", "doctor", err: :out) } unless f.core_formula? tap = <<~EOS Formula: #{f.name} diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 5d45a33c8..59dfc121d 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -350,7 +350,7 @@ module Homebrew remote = reply[/remote:? (\S+)/, 1] # repeat for hub 2.2 backwards compatibility: - remote = Utils.popen_read("hub fork 2>&1")[/remote:? (\S+)/, 1] if remote.to_s.empty? + remote = Utils.popen_read("hub", "fork", err: :out)[/remote:? (\S+)/, 1] if remote.to_s.empty? if remote.to_s.empty? formula.path.atomic_write(backup_file) unless ARGV.dry_run? diff --git a/Library/Homebrew/requirements/java_requirement.rb b/Library/Homebrew/requirements/java_requirement.rb index 949978dbd..c49fdcba9 100644 --- a/Library/Homebrew/requirements/java_requirement.rb +++ b/Library/Homebrew/requirements/java_requirement.rb @@ -103,7 +103,7 @@ class JavaRequirement < Requirement end def satisfies_version(java) - java_version_s = Utils.popen_read("#{java} -version 2>&1")[/\d+.\d/] + java_version_s = Utils.popen_read(java, "-version", err: :out)[/\d+.\d/] return false unless java_version_s java_version = Version.create(java_version_s) needed_version = Version.create(version_without_plus) |