From c9f4e03d25e2eb5729c9285437f404ff51781a50 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Tue, 19 Jul 2011 14:07:02 +0100 Subject: Fixed up configuration file search --- bin/mauveconsole | 8 ++++++-- bin/mauveserver | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/mauveconsole b/bin/mauveconsole index c9a4656..d115642 100755 --- a/bin/mauveconsole +++ b/bin/mauveconsole @@ -64,8 +64,12 @@ puts "#{$0}: version "+Mauve::VERSION if version exit 0 if help or version or manual configuration_file = ARGV.shift -configuration_file = [".", "/etc/mauvealert/"].collect{|x| File.join("mauveserver.conf") }.find{|d| File.file?(d)} if configuration_file.nil? -configuration_file = File.expand_path(configuration_file) +configuration_file = [".", "/etc/mauvealert/"].collect{|x| File.join(x, "mauveserver.conf") }.find{|d| File.file?(d)} if configuration_file.nil? +configuration_file = File.expand_path(configuration_file) unless configuration_file.nil? + +if configuration_file.nil? + error "No configuration file could be found\n" +end unless File.file?(configuration_file) error "Configuration file #{configuration_file} not found\n" diff --git a/bin/mauveserver b/bin/mauveserver index 921e6b3..d07aabb 100755 --- a/bin/mauveserver +++ b/bin/mauveserver @@ -72,8 +72,12 @@ rescue SyntaxError => no_blocks_with_procs end configuration_file = ARGV.shift -configuration_file = [".", "/etc/mauvealert/"].collect{|x| File.join("mauveserver.conf") }.find{|d| File.file?(d)} if configuration_file.nil? -configuration_file = File.expand_path(configuration_file) +configuration_file = [".", "/etc/mauvealert/"].collect{|x| File.join(x, "mauveserver.conf") }.find{|d| File.file?(d)} if configuration_file.nil? +configuration_file = File.expand_path(configuration_file) unless configuration_file.nil? + +if configuration_file.nil? + error "No configuration file could be found\n" +end unless File.file?(configuration_file) error "Configuration file #{configuration_file} not found\n" -- cgit v1.2.1