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

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index 30dd71e..e159b09 100644
--- a/lib/mailshears.rb
+++ b/lib/mailshears.rb
@@ -8,16 +8,14 @@ require 'mailshears/postfixadmin_db'
 # Load the default config file first, and let the user override it.
 require 'default_configuration'
 
+userconf_path = ENV['HOME'] + '/.mailshears.conf.rb'
 begin
-  # Try to load the user's configuration file.
-  userconf_path = ENV['HOME'] + '/.mailshears.conf'
+  # Don't crash if it doesn't exist. Maybe he likes the defaults?
   require userconf_path
-rescue
-  puts 'No user configuration file (~/.mailshears.conf) found.'
-  puts 'Continuing...'
+rescue LoadError
 end
 
-Configuration::PLUGINS.each do |plugin_file|
+Configuration::plugins.each do |plugin_file|
   require "mailshears/plugins/#{plugin_file}"
 end