From e5b0ee65bf81582983669cbafcd96c61fbe16757 Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 17 Dec 2007 07:09:10 +0000
Subject: [PATCH] Removed the 'create athena.txt' step from athena-start as the
 server does that automatically. Removed the 'kill -9' action from
 athena-start, as it prevents the server from shutting down cleanly. If your
 process gets stuck, kill it manually (or add a hard-stop option). Fixed one
 wrong revision number in changelog.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11924 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-Trunk.txt                                 |  2 +-
 athena-start                                        | 13 +------------
 .../{upgrade_svn11914.sql => upgrade_svn11915.sql}  |  0
 3 files changed, 2 insertions(+), 13 deletions(-)
 rename sql-files/{upgrade_svn11914.sql => upgrade_svn11915.sql} (100%)

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2f0b87e40c..58351e828d 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -6,7 +6,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 2007/12/14
 	* Guardian hp handling code removal (see bugreport:342)
 	- removed guardian hp from the castle data structure, database,
-	  savefiles and various script functions (use upgrade_svn11914.sql)
+	  savefiles and various script functions (use upgrade_svn11915.sql)
 	- removed guardian hp calculation and manipulation from the castle
 	  manager npc, now the hp values are updated by the server itself
 	  (glitch: when castle defense changes, all guardians are healed to full)
diff --git a/athena-start b/athena-start
index 7421456042..ab5ac3de0c 100644
--- a/athena-start
+++ b/athena-start
@@ -21,16 +21,6 @@ echo "checking..."
 #EOF
 }
 
-#check_account() {
-#    if [ ! -f ./save/account.txt ]; then
-#        echo "0    s1    p1    -    S    0" > save/account.txt
-#        echo "1    s2    p2    -    S    0" >>save/account.txt
-#        echo "2    s3    p3    -    S    0" >>save/account.txt
-#        echo "3    s4    p4    -    S    0" >>save/account.txt
-#        echo "4    s5    p5    -    S    0" >>save/account.txt
-#    fi
-#}
-
 check_files() {
 
     for i in ${L_SRV} ${C_SRV} ${M_SRV}
@@ -52,7 +42,6 @@ echo "Looks good, a nice Athena!"
 case $1 in
     'start')
         print_start
-#        check_account
         check_files
 
         exec ./${L_SRV}&
@@ -62,7 +51,7 @@ case $1 in
         echo "Now Started Athena."
 ;;
     'stop')
-        ps ax | grep -E "${L_SRV}|${C_SRV}|${M_SRV}" | awk '{print $1}' | xargs kill -9
+        ps ax | grep -E "${L_SRV}|${C_SRV}|${M_SRV}" | awk '{print $1}' | xargs kill
 ;;
     'restart')
         $0 stop
diff --git a/sql-files/upgrade_svn11914.sql b/sql-files/upgrade_svn11915.sql
similarity index 100%
rename from sql-files/upgrade_svn11914.sql
rename to sql-files/upgrade_svn11915.sql