bin/absrenamer in AbsoluteRenamer-1.1.0 vs bin/absrenamer in AbsoluteRenamer-1.1.1

- old
+ new

@@ -41,16 +41,14 @@ require 'absolute_renamer' require 'absolute_renamer/config' require 'absolute_renamer/parser' require 'absolute_renamer/external' -config_path = File.dirname(__FILE__)+'/../conf/absrenamer/absrenamer.conf' -global_conf = '/etc/absrenamer/absrenamer.conf' -custom_conf = '~/.absrenamerrc' +default_conf = File.dirname(__FILE__) + '/../conf/absrenamer/absrenamer.conf' +global_conf = '/etc/absrenamer/absrenamer.conf' +custom_conf = '~/.absrenamerrc' -AbsoluteRenamer::Config.load(config_path) -AbsoluteRenamer::Config.load(global_conf) if File.exists? global_conf -AbsoluteRenamer::Config.load(custom_conf) if File.exists? custom_conf +AbsoluteRenamer::Config.load([default_conf, global_conf, custom_conf]) AbsoluteRenamer::External.load_gems AbsoluteRenamer::External.load_core AbsoluteRenamer::Parser.parse_cmd_line