X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmailshears.rb;h=1c8c042632430735c8ea0f38957faee57335bcff;hp=0402d602be047da95203f6fab5391bb2850a1171;hb=616d9c0f3260f4d8e9bf26140fa6032c3eabca8b;hpb=a3b629b37a05b97d67620284d1c4536427fc5058

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index 0402d60..1c8c042 100644
--- a/lib/mailshears.rb
+++ b/lib/mailshears.rb
@@ -1,21 +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()
 
-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
+cfg.plugins.each do |plugin_file|
+  require "rm/plugins/#{plugin_file}"
 end
 
-Configuration::PLUGINS.each do |plugin_file|
-  require "mailshears/plugins/#{plugin_file}"
+cfg.plugins.each do |plugin_file|
+  require "mv/plugins/#{plugin_file}"
 end
-