From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sun, 12 Apr 2009 15:00:55 +0000 (+0000)
Subject: - invoke catalina.sh directly
X-Git-Tag: auto/th/tomcat-5_5_27-1~15
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=6b59bd9e84a5a909d4d7f589ddada7e57e0e70d3;p=packages%2Ftomcat.git

- invoke catalina.sh directly

Changed files:
    apache-tomcat.init -> 1.13
---

diff --git a/apache-tomcat.init b/apache-tomcat.init
index 540f74f..a3b28ac 100644
--- a/apache-tomcat.init
+++ b/apache-tomcat.init
@@ -33,7 +33,7 @@ start() {
 	if [ ! -f /var/lock/subsys/tomcat ]; then
 		msg_starting tomcat
 		busy
-		su tomcat -s /bin/sh -c /usr/share/tomcat/bin/startup.sh >/dev/null 2>&1
+		su tomcat -s /bin/sh -c '/usr/share/tomcat/bin/catalina.sh start' # >/dev/null 2>&1
 		[ $? -ne 0 ] && RETVAL=1
 		if [ $RETVAL -eq 0 ]; then
 		   	ok
@@ -51,7 +51,7 @@ stop() {
 		# Stop daemons.
 		msg_stopping tomcat
 		busy
-		su tomcat -s /bin/sh -c /usr/share/tomcat/bin/shutdown.sh >/dev/null 2>&1
+		su tomcat -s /bin/sh -c '/usr/share/tomcat/bin/catalina.sh stop' >/dev/null 2>&1
 		[ $? -eq 0 ] && ok || fail
 		rm -f /var/lock/subsys/tomcat
 	else