1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00

- Fix problems with the "status" command in the wrapper script when the daemon

is not started.

PR:		ports/116729
Submitted by:	alepulver (myself)
Approved by:	"Tong Liu" <nemoliu@gmail.com> (maintainer of tomcat{41,6}),
		Tomas Verbaitis <tomasv@megalogika.lt> (maintainer of tomcat55)
This commit is contained in:
Alejandro Pulver 2007-09-30 22:04:02 +00:00
parent 1f4dc27f41
commit 1ef36583d8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=200485
4 changed files with 16 additions and 4 deletions

View File

@ -112,6 +112,9 @@ if [ -f $pidfile ]; then
procname=`ps -o ucomm= $rc_pid`
fi
fi
if [ -z "$procname" ]; then
procname=nonexistent
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
@ -128,7 +131,7 @@ pid_touch ()
}
tomcat%%TOMCAT_VERSION%%_stop() {
rc_pid=$(check_pidfile $pidfile *$procname*)
rc_pid=$(check_pidfile $pidfile $procname)
if [ -z "$rc_pid" ]; then
[ -n "$rc_fast" ] && return 0

View File

@ -112,6 +112,9 @@ if [ -f $pidfile ]; then
procname=`ps -o ucomm= -p $rc_pid`
fi
fi
if [ -z "$procname" ]; then
procname=nonexistent
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
@ -128,7 +131,7 @@ pid_touch ()
}
tomcat%%TOMCAT_VERSION%%_stop() {
rc_pid=$(check_pidfile $pidfile *$procname*)
rc_pid=$(check_pidfile $pidfile $procname)
if [ -z "$rc_pid" ]; then
[ -n "$rc_fast" ] && return 0

View File

@ -112,6 +112,9 @@ if [ -f $pidfile ]; then
procname=`ps -o ucomm= $rc_pid`
fi
fi
if [ -z "$procname" ]; then
procname=nonexistent
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
@ -128,7 +131,7 @@ pid_touch ()
}
tomcat%%TOMCAT_VERSION%%_stop() {
rc_pid=$(check_pidfile $pidfile *$procname*)
rc_pid=$(check_pidfile $pidfile $procname)
if [ -z "$rc_pid" ]; then
[ -n "$rc_fast" ] && return 0

View File

@ -112,6 +112,9 @@ if [ -f $pidfile ]; then
procname=`ps -o ucomm= $rc_pid`
fi
fi
if [ -z "$procname" ]; then
procname=nonexistent
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
@ -128,7 +131,7 @@ pid_touch ()
}
tomcat%%TOMCAT_VERSION%%_stop() {
rc_pid=$(check_pidfile $pidfile *$procname*)
rc_pid=$(check_pidfile $pidfile $procname)
if [ -z "$rc_pid" ]; then
[ -n "$rc_fast" ] && return 0