diff options
author | Ernst de Haan <znerd@FreeBSD.org> | 2002-05-08 21:54:06 +0000 |
---|---|---|
committer | Ernst de Haan <znerd@FreeBSD.org> | 2002-05-08 21:54:06 +0000 |
commit | 15db7d6349aeb97a013636e056167aeb308f161b (patch) | |
tree | 1461d9b3df337b4496ebfda8c04158122f2aba26 /www/tomcat41 | |
parent | This really shouldn't work (diff) |
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.
Notes
Notes:
svn path=/head/; revision=58755
Diffstat (limited to 'www/tomcat41')
-rw-r--r-- | www/tomcat41/Makefile | 2 | ||||
-rw-r--r-- | www/tomcat41/files/startup.sh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile index 7a2878d7e125..ef5efb825a57 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 b27dea9f7de5..edd373ee1478 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 "" |