X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmailshears.rb;h=1c8c042632430735c8ea0f38957faee57335bcff;hp=75e38f0927df7c32df1099805b34a23b0820d430;hb=61c80543fa4fa57c89c5acc17f6842dc937206a4;hpb=314f5670531dfda9b3d708fce8b0161a098cf134

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