Replace 'account' with 'user' everywhere.

[mailshears.git] / bin / mailshears

diff --git a/bin/mailshears b/bin/mailshears
index 441708e674401e62dd0657ebe5e9e9184a7644d6..f7b1963cc8bde0a49cfc388fa29d963cf8e3db55 100755 (executable)
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -2,14 +2,14 @@
 #
 # mailshears, to prune unused mail directories.
 #
-# Mail accounts for virtual hosts are stored in SQL, and managed by
+# Mail users for virtual hosts are stored in SQL, and managed by
 # Postfixadmin. However, the physical directories are handled by
 # Postfix/Dovecot and are left untouched by Postfixadmin. This is good
 # for security, but comes at a cost: Postfixadmin can't remove a
 # user's mail directory when his or her account is deleted.
 #
-# This program compares the list of filesystem accounts with the ones
-# in the database. It outputs any accounts that exist in the
+# This program compares the list of filesystem users with the ones
+# in the database. It outputs any users that exist in the
 # filesystem, but not the database.
 #
 
@@ -62,7 +62,7 @@ require "#{mode_name}/#{mode_name}_runner"
 require "#{mode_name}/#{mode_name}_dummy_runner"
 
 def make_header(plugin_name)
-  # The header that we output before the list of domains/accounts.
+  # The header that we output before the list of domains/users.
   # Just the path of this script, the current time, and the plugin name.
   exe = File.basename($PROGRAM_NAME)
   header = "#{exe}, "
@@ -102,10 +102,15 @@ else
   dummy_runner_class = PruneDummyRunner
 end
 
-puts make_header(plugin_class.to_s())
+
+# Buffer the output so that we can avoid printing the informational
+# header when no plugins produce output.
+require 'stringio'
+output_buffer = StringIO.new()
+$stdout = output_buffer
 
 plugin_class.includers.each do |plugin_class_includer|
-  plugin = plugin_class_includer.new()
+  plugin = plugin_class_includer.new(cfg)
 
   if cfg.i_mean_business then
     runner = runner_class.new()
@@ -117,5 +122,13 @@ plugin_class.includers.each do |plugin_class_includer|
   # appropriate runner. The Rm(Dummy)Runner have splats on their
   # *target arguments as well, to turn ARGV back into an array.
   runner.run(plugin, *ARGV)
+end
 
+# Restore stdout, and print the header plus whatever the plugins
+# produced if they produced anything. If they didn't, we avoid
+# printing the header.
+$stdout = STDOUT
+if output_buffer.size > 0 then
+  puts make_header(plugin_class.to_s())
+  puts output_buffer.string()
 end