Begin building the framework to rename accounts. A pile of crap right now.

[mailshears.git] / lib / mailshears.rb

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index 30dd71ebc99130aeb0c128a7433fee5d244b57da..1c8c042632430735c8ea0f38957faee57335bcff 100644 (file)
--- a/lib/mailshears.rb
+++ b/lib/mailshears.rb
@@ -1,23 +1,18 @@
-# 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 'mailshears/postfixadmin_db'
+require 'common/configuration'
+require 'common/errors'
+require 'common/exit_codes'
+require 'common/postfixadmin_db'

 
 

-# Load the default config file first, and let the user override it.
-require 'default_configuration'
+cfg = Configuration.new()

 
 

-begin
-  # Try to load the user's configuration file.
-  userconf_path = ENV['HOME'] + '/.mailshears.conf'
-  require userconf_path
-rescue
-  puts 'No user configuration file (~/.mailshears.conf) found.'
-  puts 'Continuing...'
+cfg.plugins.each do |plugin_file|
+  require "rm/plugins/#{plugin_file}"

 end
 
 end
 

-Configuration::PLUGINS.each do |plugin_file|
-  require "mailshears/plugins/#{plugin_file}"
+cfg.plugins.each do |plugin_file|
+  require "mv/plugins/#{plugin_file}"

 end
 end

-