diff options
| author | hq <hq@FreeBSD.org> | 2005-11-21 23:30:37 +0800 |
|---|---|---|
| committer | hq <hq@FreeBSD.org> | 2005-11-21 23:30:37 +0800 |
| commit | c56bc057a7bd58a550876cf1fea063f38610b060 (patch) | |
| tree | b4a173db545f925c732f29180e7ccf65504c769c /www/cocoon/files | |
| parent | 8153c9299ed1431f735179b8b6e3403794d14334 (diff) | |
| download | freebsd-ports-gnome-c56bc057a7bd58a550876cf1fea063f38610b060.tar.gz freebsd-ports-gnome-c56bc057a7bd58a550876cf1fea063f38610b060.tar.zst freebsd-ports-gnome-c56bc057a7bd58a550876cf1fea063f38610b060.zip | |
Update to 2.1.8
PR: 89371
Submitted by: maintainer
Diffstat (limited to 'www/cocoon/files')
| -rw-r--r-- | www/cocoon/files/cocoonctl | 9 | ||||
| -rw-r--r-- | www/cocoon/files/pkg-deinstall | 12 |
2 files changed, 12 insertions, 9 deletions
diff --git a/www/cocoon/files/cocoonctl b/www/cocoon/files/cocoonctl index b1aad58b9002..bfc05ad28fe3 100644 --- a/www/cocoon/files/cocoonctl +++ b/www/cocoon/files/cocoonctl @@ -141,19 +141,20 @@ if __name__ == '__main__': APP_HOME = "%%APP_HOME%%" PID_FILE = "%%PID_FILE%%" COMMAND = "%%PREFIX%%/sbin/%%APP_NAME%%.sh" + os.environ["JAVA_OPTIONS"] = " ".join(sys.argv[1:-1]) ARGS = [COMMAND, "servlet"] - if len(sys.argv) != 2: + if len(sys.argv) < 2: usage() sys.exit(1) - if sys.argv[1] == "start": + if sys.argv[-1] == "start": start() - elif sys.argv[1] == "stop": + elif sys.argv[-1] == "stop": stop() - elif sys.argv[1] == "restart": + elif sys.argv[-1] == "restart": stop() start() diff --git a/www/cocoon/files/pkg-deinstall b/www/cocoon/files/pkg-deinstall index b540c3647127..fcfbbb0d33c2 100644 --- a/www/cocoon/files/pkg-deinstall +++ b/www/cocoon/files/pkg-deinstall @@ -43,11 +43,13 @@ if [ "$2" = "DEINSTALL" ]; then fi fi - echo -n ">> Removing log file (${LOG_FILE})..." - if rm ${LOG_FILE} > /dev/null 2> /dev/null ; then - echo " [ DONE ]" - else - echo " [ FAILED ]" + if [ -e ${LOG_FILE} ] ; then + echo -n ">> Removing log file (${LOG_FILE})..." + if rm ${LOG_FILE} > /dev/null 2> /dev/null ; then + echo " [ DONE ]" + else + echo " [ FAILED ]" + fi fi fi |