Factor out common code that can be used to mv (rename) accounts.

[mailshears.git] / lib / mailshears.rb

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index 0402d602be047da95203f6fab5391bb2850a1171..cb8e43cdf16631ff834ee2cd57eee0a5e51aa012 100644 (file)
--- a/lib/mailshears.rb
+++ b/lib/mailshears.rb
@@ -1,21 +1,14 @@
-# Load the rest of the code we'll use.
+# Load the rest of the code we'll use. This loads what we'll need in
+# the executables; the library files are supposed to require what they
+# need.
 
-# And the necessary classes.
-require 'mailshears/errors.rb'
-require 'mailshears/exit_codes.rb'
+require 'common/configuration'
+require 'common/errors'
+require 'common/exit_codes'
 require 'mailshears/postfixadmin_db'
 
-# Load the default config file first, and let the user override it.
-require 'default_configuration'
+cfg = Configuration.new()
 
-userconf_path = ENV['HOME'] + '/.mailshears.conf'
-begin
-  # Don't crash if it doesn't exist. Maybe he likes the defaults?
-  require userconf_path
-rescue LoadError
-end
-
-Configuration::PLUGINS.each do |plugin_file|
+cfg.plugins.each do |plugin_file|
   require "mailshears/plugins/#{plugin_file}"
 end
-