X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=bin%2Fmailshears;h=1398a8f06ab67d7cb5aac84d1bf2aa2d074953ce;hp=28c165cee765492bbaeb28f91ae76a54da750631;hb=6f2bc0181c6bb900e37d04ea722beec54486b87e;hpb=365d681f1ef45bd3f5f2c9dded07108bdd75a1ff

diff --git a/bin/mailshears b/bin/mailshears
index 28c165c..1398a8f 100755
--- 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}, "
@@ -84,22 +84,14 @@ end
 
 
 plugin_class = nil
-runner_class = nil
-dummy_runner_class = nil
 
 if mode == :rm then
   plugin_class = RmPlugin
-  runner_class = RmRunner
-  dummy_runner_class = RmDummyRunner
 elsif mode == :mv then
   plugin_class = MvPlugin
-  runner_class = MvRunner
-  dummy_runner_class = MvDummyRunner
 else
   # Safe, catch-all default
   plugin_class = PrunePlugin
-  runner_class = PruneRunner
-  dummy_runner_class = PruneDummyRunner
 end
 
 
@@ -113,9 +105,9 @@ plugin_class.includers.each do |plugin_class_includer|
   plugin = plugin_class_includer.new(cfg)
 
   if cfg.i_mean_business then
-    runner = runner_class.new()
+    runner = plugin.runner().new()
   else
-    runner = dummy_runner_class.new()
+    runner = plugin.dummy_runner().new()
   end
 
   # The splat passes the correct (we hope) number of arguments to the