From ec866decb54814f187721397baef557bdd5477a5 Mon Sep 17 00:00:00 2001 From: znerd Date: Wed, 8 May 2002 21:54:06 +0000 Subject: 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. --- www/jakarta-tomcat4/Makefile | 2 +- www/jakarta-tomcat4/files/startup.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'www/jakarta-tomcat4') diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile index 7a2878d7e125..ef5efb825a57 100644 --- a/www/jakarta-tomcat4/Makefile +++ b/www/jakarta-tomcat4/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/jakarta-tomcat4/files/startup.sh b/www/jakarta-tomcat4/files/startup.sh index b27dea9f7de5..edd373ee1478 100644 --- a/www/jakarta-tomcat4/files/startup.sh +++ b/www/jakarta-tomcat4/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 "" -- cgit