X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmailshears.rb;fp=lib%2Fmailshears.rb;h=0402d602be047da95203f6fab5391bb2850a1171;hp=30dd71ebc99130aeb0c128a7433fee5d244b57da;hb=a3b629b37a05b97d67620284d1c4536427fc5058;hpb=87c9c583caca33112f88622eed8849e98bdf3a26 diff --git a/lib/mailshears.rb b/lib/mailshears.rb index 30dd71e..0402d60 100644 --- a/lib/mailshears.rb +++ b/lib/mailshears.rb @@ -8,13 +8,11 @@ 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' 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|