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

Move require? to utils.

Browse Source
This commit is contained in:
Markus Reiter 2017-06-14 12:51:36 +02:00
parent 5a047c7c27
commit 599a618273
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/brew.rb
View File

@ -21,14 +21,6 @@ if ARGV == %w[--version] || ARGV == %w[-v]
exit 0 exit 0
end end
def require?(path)
return false if path.nil?
require path
rescue LoadError => e
# we should raise on syntax errors but not if the file doesn't exist.
raise unless e.message.include?(path)
end
begin begin
trap("INT", std_trap) # restore default CTRL-C handler trap("INT", std_trap) # restore default CTRL-C handler

8
Library/Homebrew/utils.rb
View File

@ -15,6 +15,14 @@ require "utils/svn"
require "utils/tty" require "utils/tty"
require "time" require "time"
def require?(path)
return false if path.nil?
require path
rescue LoadError => e
# we should raise on syntax errors but not if the file doesn't exist.
raise unless e.message.include?(path)
end
def ohai(title, *sput) def ohai(title, *sput)
title = Tty.truncate(title) if $stdout.tty? && !ARGV.verbose? title = Tty.truncate(title) if $stdout.tty? && !ARGV.verbose?
puts Formatter.headline(title, color: :blue) puts Formatter.headline(title, color: :blue)