summaryrefslogtreecommitdiffstats
path: root/www/tomcat41
diff options
context:
space:
mode:
authorznerd <znerd@FreeBSD.org>2002-05-08 21:54:06 +0000
committerznerd <znerd@FreeBSD.org>2002-05-08 21:54:06 +0000
commitec866decb54814f187721397baef557bdd5477a5 (patch)
tree4bed708857260061f7a1bc7f531afd7f79c558f9 /www/tomcat41
parenta20b6a113b2e70332d703046b890c12bbaa1c7d2 (diff)
downloadFreeBSD-ports-ec866decb54814f187721397baef557bdd5477a5.zip
FreeBSD-ports-ec866decb54814f187721397baef557bdd5477a5.tar.gz
Improved the startup script. Always displaying a space first
before the name of the application being started/stopped. The advantage is that if there is an error, then the message will have a space prepended instead of being appended to the previous application name. When the application is 'stop'ped, the error messages, if any, are now hidden. Instead the name of the application is just shown. Bumped PORTREVISION.
Diffstat (limited to 'www/tomcat41')
-rw-r--r--www/tomcat41/Makefile2
-rw-r--r--www/tomcat41/files/startup.sh6
2 files changed, 5 insertions, 3 deletions
diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile
index 7a2878d..ef5efb8 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jakarta-tomcat
PORTVERSION= 4.0.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www java
MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat-${PORTVERSION:R}/release/v${PORTVERSION}/bin/ \
http://www.metaverse.nl/~ernst/ \
diff --git a/www/tomcat41/files/startup.sh b/www/tomcat41/files/startup.sh
index b27dea9..edd373e 100644
--- a/www/tomcat41/files/startup.sh
+++ b/www/tomcat41/files/startup.sh
@@ -13,15 +13,17 @@ MYSELF=`basename $0`
case "$1" in
start)
+ echo -n ' '
truncate -s 0 %%PID_FILE%%
chown %%USER%%:%%GROUP%% %%PID_FILE%%
chmod 600 %%PID_FILE%%
- su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% start > /dev/null" && echo -n ' %%APP_SHORTNAME%%'
+ su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% start" >/dev/null && echo -n '%%APP_SHORTNAME%%'
;;
stop)
+ echo -n ' '
chown %%USER%%:%%GROUP%% %%PID_FILE%%
chmod 600 %%PID_FILE%%
- su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% stop > /dev/null" && echo -n ' %%APP_SHORTNAME%%'
+ su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% stop" >/dev/null 2>&1 ; echo -n '%%APP_SHORTNAME%%'
;;
*)
echo ""
OpenPOWER on IntegriCloud