eathena.sh and eathena-monitor corrections

When the monitor didn't find the configuration, it didn't print out the
path it actually tried.

The shell script was modified to actually pass the path to the
configuration to the monitor, otherwise it can't find this itself when
the 'workdir' doesn't match its default value.

2 files changed, 2 insertions, 2 deletions

diff --git a/eathena-monitor.c b/eathena-monitor.c
index 3ab7f0f2..8e9d985c 100644
--- a/eathena-monitor.c
+++ b/eathena-monitor.c
@@ -79,7 +79,7 @@ int read_config(char *filename) {
     int errors = 0;
 
     if ( !(input = fopen(filename,"r")) && !(input = fopen (config, "r"))) {
-	fprintf (stderr, "ERROR: Config file doesn't exist (%s and %s), using builtin defaults\n",filename,CONFIG);
+	fprintf (stderr, "ERROR: Config file doesn't exist (%s and %s), using builtin defaults\n", filename, config);
 	return -1;
     }
     
diff --git a/eathena.sh b/eathena.sh
index edfabf9c..31c3a860 100755
--- a/eathena.sh
+++ b/eathena.sh
@@ -20,7 +20,7 @@ cd ${SRVHOMEDIR}
 eathena_start() {
     if [ -x ${SRVHOMEDIR}/eathena-monitor ]; 
 	then echo "Starting eathena monitor..."
-	     ${SRVHOMEDIR}/eathena-monitor
+	     ${SRVHOMEDIR}/eathena-monitor ${SRVHOMEDIR}/conf/eathena-monitor.conf
 	else echo "Eathena monitor binary is not executable or not found."
     fi
 }