Merge pull request #3518 from rolandwalker/casecmp_fixes

fix some erroneous uses of `casecmp`
Homebrew · Mar 12, 2014 · f531839 · f531839
2 parents 0d18021 + ba8d9ba
commit f531839
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/cask/caveats.rb b/lib/cask/caveats.rb
@@ -61,7 +61,7 @@ def path_environment_variable(path)
 
   def files_in_usr_local
     localpath = '/usr/local'
-    if localpath.casecmp(HOMEBREW_PREFIX)
+    if HOMEBREW_PREFIX.downcase.index(localpath) == 0
       puts <<-EOS.undent
       Cask #{@cask} installs files under "#{localpath}".  The presence of such
       files can cause warnings when running "brew doctor", which is considered

diff --git a/lib/cask/container/criteria.rb b/lib/cask/container/criteria.rb
@@ -44,7 +44,7 @@ def lsar
 
   def extension(test)
     %r{\.([^\.]+)$}.match(path) do |ext|
-      ext.captures.first.casecmp(test)
+      ext.captures.first.casecmp(test) == 0
     end
   end