From 913fd65ef9a5fa55ebbd5ac4502f72895879fc84 Mon Sep 17 00:00:00 2001 From: glighta Date: Sat, 24 Nov 2012 08:50:59 +0000 Subject: -Fix bugreport:6751 allow noseige to be casted while under status. -Upd athena-start, save pid to not kill all other process with same name (annoying when multiple server) -Harmonize setmapflag and @mapflag, flag value is always an int, and could be superior to 1 for some mapflag -Fix bugreport:6923 for Windows -Upd @zeny to remove rest of zeny if not enough money as requested git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16959 54d463be-8e91-2dee-dedb-b68131a5f0ec --- athena-start | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'athena-start') diff --git a/athena-start b/athena-start index ab5ac3de0..2b9fcc38e 100755 --- a/athena-start +++ b/athena-start @@ -37,7 +37,7 @@ echo "Check complete." echo "Looks good, a nice Athena!" #EOF } - + case $1 in 'start') @@ -45,13 +45,22 @@ case $1 in check_files exec ./${L_SRV}& + echo $! > .${L_SRV}.pid exec ./${C_SRV}& + echo $! > .${C_SRV}.pid exec ./${M_SRV}& + echo $! > .${M_SRV}.pid echo "Now Started Athena." ;; 'stop') - ps ax | grep -E "${L_SRV}|${C_SRV}|${M_SRV}" | awk '{print $1}' | xargs kill + for i in .${L_SRV}.pid .${C_SRV}.pid .${M_SRV}.pid + do + if [ -e ./$i ]; then + kill $(cat $i) + rm $i + fi + done ;; 'restart') $0 stop -- cgit v1.2.3-60-g2f50