X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmailshears.rb;h=cb8e43cdf16631ff834ee2cd57eee0a5e51aa012;hp=30dd71ebc99130aeb0c128a7433fee5d244b57da;hb=c6cab6b71770d14dad1115db90a00b990c44a58d;hpb=87c9c583caca33112f88622eed8849e98bdf3a26

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index 30dd71e..cb8e43c 100644
--- a/lib/mailshears.rb
+++ b/lib/mailshears.rb
@@ -1,23 +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()
 
-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...'
-end
-
-Configuration::PLUGINS.each do |plugin_file|
+cfg.plugins.each do |plugin_file|
   require "mailshears/plugins/#{plugin_file}"
 end
-