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

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index 30dd71e..55a87f8 100644
--- a/lib/mailshears.rb
+++ b/lib/mailshears.rb
@@ -1,23 +1,7 @@
-# Load the rest of the code we'll use.
-
-# And the necessary classes.
-require 'mailshears/errors.rb'
-require 'mailshears/exit_codes.rb'
-require 'mailshears/postfixadmin_db'
-
-# Load the default config file first, and let the user override it.
-require 'default_configuration'
-
-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|
-  require "mailshears/plugins/#{plugin_file}"
-end
+# Load only the files needed by our executable. The library files are
+# supposed to require what they need themselves.
 
+require 'common/configuration'
+require 'common/errors'
+require 'common/exit_codes'
+require 'common/user_interface'