Always keep info files

Closes Homebrew/homebrew#26659.

3 files changed, 8 insertions, 12 deletions

diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb
index 437b56628..80a8c74e0 100644
--- a/Library/Homebrew/cleaner.rb
+++ b/Library/Homebrew/cleaner.rb
@@ -13,15 +13,11 @@ class Cleaner
     @f = f
     [f.bin, f.sbin, f.lib].select{ |d| d.exist? }.each{ |d| clean_dir d }
 
-    if ENV['HOMEBREW_KEEP_INFO']
-      # Get rid of the directory file, so it no longer bother us at link stage.
-      info_dir_file = f.info + 'dir'
-      if info_dir_file.file? and not f.skip_clean? info_dir_file
-        puts "rm #{info_dir_file}" if ARGV.verbose?
-        info_dir_file.unlink
-      end
-    else
-      f.info.rmtree if f.info.directory? and not f.skip_clean? f.info
+    # Get rid of the directory file, so it no longer bother us at link stage.
+    info_dir_file = f.info + 'dir'
+    if info_dir_file.file? and not f.skip_clean? info_dir_file
+      puts "rm #{info_dir_file}" if ARGV.verbose?
+      info_dir_file.unlink
     end
 
     prune
diff --git a/Library/Homebrew/cmd/prune.rb b/Library/Homebrew/cmd/prune.rb
index cc600fd7f..1f4577b0d 100644
--- a/Library/Homebrew/cmd/prune.rb
+++ b/Library/Homebrew/cmd/prune.rb
@@ -12,7 +12,7 @@ module Homebrew extend self
         path.extend(ObserverPathnameExtension)
         if path.symlink?
           unless path.resolved_path_exists?
-            if ENV['HOMEBREW_KEEP_INFO'] and path.to_s =~ Keg::INFOFILE_RX
+            if path.to_s =~ Keg::INFOFILE_RX
               path.uninstall_info unless ARGV.dry_run?
             end
 
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 442976c8b..42e960ad9 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -49,7 +49,7 @@ class Keg < Pathname
         # check whether the file to be unlinked is from the current keg first
         next if !dst.symlink? || !dst.exist? || src != dst.resolved_path
 
-        dst.uninstall_info if dst.to_s =~ INFOFILE_RX and ENV['HOMEBREW_KEEP_INFO']
+        dst.uninstall_info if dst.to_s =~ INFOFILE_RX
         dst.unlink
         Find.prune if src.directory?
       end
@@ -130,7 +130,7 @@ class Keg < Pathname
     link_dir('share', mode) do |path|
       case path.to_s
       when 'locale/locale.alias' then :skip_file
-      when INFOFILE_RX then ENV['HOMEBREW_KEEP_INFO'] ? :info : :skip_file
+      when INFOFILE_RX then :info
       when LOCALEDIR_RX then :mkpath
       when *share_mkpaths then :mkpath
       when /^icons\/.*\/icon-theme\.cache$/ then :skip_file