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

Merge pull request #3579 from MikeMcQuaid/gist-logs-full-path

Browse Source 
gist-logs: use full path to brew.
This commit is contained in:
Mike McQuaid 2017-12-14 20:15:15 +00:00 committed by GitHub
commit 0cbe1f3a05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/gist-logs.rb
View File

@ -27,7 +27,7 @@ module Homebrew
# Dummy summary file, asciibetically first, to control display title of gist # Dummy summary file, asciibetically first, to control display title of gist
files["# #{f.name} - #{timestamp}.txt"] = { content: brief_build_info(f) } files["# #{f.name} - #{timestamp}.txt"] = { content: brief_build_info(f) }
files["00.config.out"] = { content: s.string } 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? unless f.core_formula?
tap = <<~EOS tap = <<~EOS
Formula: #{f.name} Formula: #{f.name}

2
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -350,7 +350,7 @@ module Homebrew
remote = reply[/remote:? (\S+)/, 1] remote = reply[/remote:? (\S+)/, 1]
# repeat for hub 2.2 backwards compatibility: # 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? if remote.to_s.empty?
formula.path.atomic_write(backup_file) unless ARGV.dry_run? formula.path.atomic_write(backup_file) unless ARGV.dry_run?

2
Library/Homebrew/requirements/java_requirement.rb
View File

@ -103,7 +103,7 @@ class JavaRequirement < Requirement
end end
def satisfies_version(java) 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 return false unless java_version_s
java_version = Version.create(java_version_s) java_version = Version.create(java_version_s)
needed_version = Version.create(version_without_plus) needed_version = Version.create(version_without_plus)