X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=bin%2Fmailshears;h=a4b082323611500e22e6e159a6e5a35c5e492c17;hp=9f913621667c686e49504e1b6f465458410c2ca8;hb=806cb5223ac1f439cc40b8354a7dad08b380cfd5;hpb=5c1d0e3ba43ec717422317d34acc50abda5b591e

diff --git a/bin/mailshears b/bin/mailshears
index 9f91362..a4b0823 100755
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -13,40 +13,16 @@
 # filesystem, but not the database.
 #
 
-# We need Pathname to get the real filesystem path
-# of this script (and not, for example, the path of
-# a symlink which points to it).
-require 'pathname'
-
-# This bit of magic adds the parent directory (the
-# project root) to the list of ruby load paths.
-# Thus, our require statements will work regardless of
-# how or from where the script was run.
-executable = Pathname.new(__FILE__).realpath.to_s
-$: << File.dirname(executable) + '/../'
-
-# Needed for rm_rf.
-require 'fileutils'
-
-# Load our config file.
-require 'bin/configuration'
-
-# And the necessary classes.
-require 'src/errors.rb'
-require 'src/exit_codes.rb'
-require 'src/postfixadmin_db'
-
-Configuration::PLUGINS.each do |plugin_file|
-  require "src/plugins/#{plugin_file}"
-end
+require 'mailshears'
 
-pgadb = PostfixadminDb.new(Configuration::DBHOST,
-                           Configuration::DBPORT,
-                           Configuration::DBOPTS,
-                           Configuration::DBTTY,
-                           Configuration::DBNAME,
-                           Configuration::DBUSER,
-                           Configuration::DBPASS)
+cfg = Configuration.new()
+pgadb = PostfixadminDb.new(cfg.dbhost,
+                           cfg.dbport,
+                           cfg.dbopts,
+                           cfg.dbtty,
+                           cfg.dbname,
+                           cfg.dbuser,
+                           cfg.dbpass)
 
 
 begin
@@ -109,15 +85,22 @@ Plugin.includers.each do |plugin_class|
       puts "Found: #{account} (#{plugin.describe_account(account)})"
     end
 
-    if Configuration::I_MEAN_BUSINESS
-      leftover_domains.each do |domain|
-        plugin.delete_domain(domain)
-        puts "Removed: #{domain} (#{plugin.describe_domain(domain)})"
-      end
-
+    if cfg.i_mean_business
+      # We have to delete the accounts before the domain,
+      # otherwise they'd already be gone.
       leftover_accounts.each do |account|
+        # Get the description before we delete the domain.
+        # This can still fail if the account's domain is gone.
+        account_description = plugin.describe_account(account)
         plugin.delete_account(account)
-        puts "Removed: #{account} (#{plugin.describe_account(account)})"
+        puts "Removed: #{account} (#{account_description})"
+      end
+
+      leftover_domains.each do |domain|
+        # Get the description before we delete the domain.
+        domain_description = plugin.describe_domain(domain)
+        plugin.delete_domain(domain)
+        puts "Removed: #{domain} (#{domain_description})"
       end
     end