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

inreplace: also warn on plain gsub! usage

Browse Source
This commit is contained in:
Adam Vandenberg 2012-02-25 16:57:03 -08:00 committed by Jack Nagel
parent a3edec8b88
commit 42d44053ef
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/extend/string.rb
View File

@ -13,11 +13,20 @@ end
# used by the inreplace function (in utils.rb)
module StringInreplaceExtension
# Warn if nothing was replaced
def gsub! before, after, audit_result=true
sub = super(before, after)
if audit_result and sub.nil?
opoo "inreplace: replacement of '#{before}' with '#{after}' failed"
end
return sub
end
# Looks for Makefile style variable defintions and replaces the
# value with "new_value", or removes the definition entirely.
def change_make_var! flag, new_value
new_value = "#{flag}=#{new_value}"
sub = gsub! Regexp.new("^#{flag}[ \\t]*=[ \\t]*(.*)$"), new_value
sub = gsub! Regexp.new("^#{flag}[ \\t]*=[ \\t]*(.*)$"), new_value, false
opoo "inreplace: changing '#{flag}' to '#{new_value}' failed" if sub.nil?
end
@ -27,7 +36,7 @@ module StringInreplaceExtension
flags = [flags] unless flags.kind_of? Array
flags.each do |flag|
# Also remove trailing \n, if present.
sub = gsub! Regexp.new("^#{flag}[ \\t]*=(.*)$\n?"), ""
sub = gsub! Regexp.new("^#{flag}[ \\t]*=(.*)$\n?"), "", false
opoo "inreplace: removing '#{flag}' failed" if sub.nil?
end
end