Explorar o código

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

ultramage %!s(int64=17) %!d(string=hai) anos
pai
achega
e5b0ee65bf
Modificáronse 3 ficheiros con 2 adicións e 13 borrados
  1. 1 1
      Changelog-Trunk.txt
  2. 1 12
      athena-start
  3. 0 0
      sql-files/upgrade_svn11915.sql

+ 1 - 1
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)

+ 1 - 12
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

+ 0 - 0
sql-files/upgrade_svn11914.sql → sql-files/upgrade_svn11915.sql