aboutsummaryrefslogtreecommitdiffstats
path: root/www/tomcat7
diff options
context:
space:
mode:
authoralepulver <alepulver@FreeBSD.org>2007-10-01 06:04:02 +0800
committeralepulver <alepulver@FreeBSD.org>2007-10-01 06:04:02 +0800
commitdf5a36999e332b9bf40a5d780bb607b7b61a2275 (patch)
treeb80236a59937483f591bd12af4d1bdaf893b51a5 /www/tomcat7
parent60eeb253181dddbd30f8748b56c408b97fe25a25 (diff)
downloadfreebsd-ports-gnome-df5a36999e332b9bf40a5d780bb607b7b61a2275.tar.gz
freebsd-ports-gnome-df5a36999e332b9bf40a5d780bb607b7b61a2275.tar.zst
freebsd-ports-gnome-df5a36999e332b9bf40a5d780bb607b7b61a2275.zip
- 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)
Diffstat (limited to 'www/tomcat7')
-rw-r--r--www/tomcat7/files/tomcat6.sh.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/www/tomcat7/files/tomcat6.sh.in b/www/tomcat7/files/tomcat6.sh.in
index bc87ede6d9d4..15c8fd53658e 100644
--- a/www/tomcat7/files/tomcat6.sh.in
+++ b/www/tomcat7/files/tomcat6.sh.in
@@ -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