summaryrefslogtreecommitdiff
path: root/eathena.sh
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-01-12 08:02:59 -0700
committerFate <fate-tmw@googlemail.com>2009-01-12 08:02:59 -0700
commit03e7550003650cb5cf79eb0c8d470ce8bd24ae27 (patch)
tree437785d13b545d6562ba3b00513b8eb5a89c8f15 /eathena.sh
parent647f4a35bf8831df4fe23754e824f4bdfb5dcf72 (diff)
parent5db6cb7d6c09dbb091edbdf21a3e0e3feae3175a (diff)
downloadserverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.gz
serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.bz2
serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.xz
serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.zip
Merge branch 'master' into magic
Conflicts: db/item_db.txt
Diffstat (limited to 'eathena.sh')
-rwxr-xr-xeathena.sh2
1 files changed, 1 insertions, 1 deletions
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
}