X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmailshears.rb;h=1c8c042632430735c8ea0f38957faee57335bcff;hp=e159b09b3b6ca6c93dce474a1d0106b1ae261b42;hb=ec3c9099a29f40d95f055ea0f7fb25a99d913de3;hpb=451f1c3175c1a3c8670f51ebc907102d8c99820d

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index e159b09..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.rb'
-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
-