Update comments in the executable and factor out the make_header() function.

[mailshears.git] / lib / mailshears.rb

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index 30dd71ebc99130aeb0c128a7433fee5d244b57da..e5f2e6e706750d5d4011d48e15cf538172f0baf9 100644 (file)
--- a/lib/mailshears.rb
+++ b/lib/mailshears.rb
@@ -1,23 +1,8 @@
-# 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 the rest of the code we'll use. This loads only what we'll need
+# in the executable. The library files are supposed to require what
+# they need.
+
+require 'common/configuration'
+require 'common/errors'
+require 'common/exit_codes'
+require 'common/user_interface'