aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2011-06-15 19:51:42 +0100
committerPatrick J Cherry <patrick@bytemark.co.uk>2011-06-15 19:51:42 +0100
commitbbac575fc93c3d9a43039dd5b710bb7197dd4b40 (patch)
tree9b3d3a6215edbca6331062ed851ca1bb918773af /bin
parentfc0327f91fb134e1df994143a78c22df7d8f62e4 (diff)
Now looks for the correct config file :)
Diffstat (limited to 'bin')
-rwxr-xr-xbin/mauveserver4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/mauveserver b/bin/mauveserver
index baeee75..2d810b9 100755
--- a/bin/mauveserver
+++ b/bin/mauveserver
@@ -10,12 +10,12 @@ end
require 'mauve/configuration'
-configuration_file = ARGV[0]
+configuration_file = ARGV.shift
configuration_file = [".", "/etc/mauvealert/"].find{|d| File.file?(File.join(d,"mauveserver.conf")) } if configuration_file.nil?
configuration_file = File.expand_path(configuration_file)
unless File.file?(configuration_file)
- STDERR.print "Configuration file #{configuration_file} not found"
+ STDERR.print "Configuration file #{configuration_file} not found\n"
Kernel.exit 1
end