diff options
| author | znerd <znerd@FreeBSD.org> | 2002-03-05 07:31:47 +0800 |
|---|---|---|
| committer | znerd <znerd@FreeBSD.org> | 2002-03-05 07:31:47 +0800 |
| commit | aeb2411d99c95062f1841057e3199db23ff3da4d (patch) | |
| tree | 476e659407073e28d269793fc1126f2885638fec | |
| parent | e342f58c71f9029ce45ee32f94cd1c382b774c30 (diff) | |
| download | freebsd-ports-gnome-aeb2411d99c95062f1841057e3199db23ff3da4d.tar.gz freebsd-ports-gnome-aeb2411d99c95062f1841057e3199db23ff3da4d.tar.zst freebsd-ports-gnome-aeb2411d99c95062f1841057e3199db23ff3da4d.zip | |
Improved pkg-deinstall. It now displays a warning message
if the www user still exists. Bumped PORTREVISION.
| -rw-r--r-- | www/orion-devel/Makefile | 2 | ||||
| -rw-r--r-- | www/orion-devel/pkg-deinstall | 38 | ||||
| -rw-r--r-- | www/orion/Makefile | 2 | ||||
| -rw-r--r-- | www/orion/pkg-deinstall | 38 |
4 files changed, 66 insertions, 14 deletions
diff --git a/www/orion-devel/Makefile b/www/orion-devel/Makefile index 6f37a99ec6e1..73bb56825960 100644 --- a/www/orion-devel/Makefile +++ b/www/orion-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= orion PORTVERSION= 1.5.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www java MASTER_SITES= http://www.orionserver.com/distributions/ \ http://www.atlassian.com/software/orion/downloads/ \ diff --git a/www/orion-devel/pkg-deinstall b/www/orion-devel/pkg-deinstall index 643e3cdebf39..a5703cab3ad4 100644 --- a/www/orion-devel/pkg-deinstall +++ b/www/orion-devel/pkg-deinstall @@ -1,8 +1,34 @@ #!/bin/sh -PID_FILE=/var/run/orion.pid -if [ -e ${PID_FILE} ]; then - echo -n "Orion Server is still running." - /bin/kill `cat ${PID_FILE}` - rm -f ${PID_FILE} - echo " Stopped." +# +# This script does the following. +# +# * Checks if the Orion PID file exists. If it does, it kills the +# Orion process and removes the PID file. +# +# * Checks if the 'www' user exists. If it does, then it displays +# a message. +# +# $FreeBSD$ +# + +# Make sure we're in the right stage of the process +if [ "$2" = "DEINSTALL" ]; then + # Kill Orion if it is still running + PID_FILE=/var/run/orion.pid + if [ -e ${PID_FILE} ]; then + echo -n "Orion Server is still running." + /bin/kill `cat ${PID_FILE}` + rm -f ${PID_FILE} + echo " Stopped." + fi fi + + +if [ "$2" = "POST-DEINSTALL" ]; then + # If the user exists, then display a message + if pw usershow "www" 2>/dev/null 1>&2; then + echo "To delete the www user permanently, use 'pw userdel www'" + fi +fi + +exit 0 diff --git a/www/orion/Makefile b/www/orion/Makefile index 6f37a99ec6e1..73bb56825960 100644 --- a/www/orion/Makefile +++ b/www/orion/Makefile @@ -7,7 +7,7 @@ PORTNAME= orion PORTVERSION= 1.5.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www java MASTER_SITES= http://www.orionserver.com/distributions/ \ http://www.atlassian.com/software/orion/downloads/ \ diff --git a/www/orion/pkg-deinstall b/www/orion/pkg-deinstall index 643e3cdebf39..a5703cab3ad4 100644 --- a/www/orion/pkg-deinstall +++ b/www/orion/pkg-deinstall @@ -1,8 +1,34 @@ #!/bin/sh -PID_FILE=/var/run/orion.pid -if [ -e ${PID_FILE} ]; then - echo -n "Orion Server is still running." - /bin/kill `cat ${PID_FILE}` - rm -f ${PID_FILE} - echo " Stopped." +# +# This script does the following. +# +# * Checks if the Orion PID file exists. If it does, it kills the +# Orion process and removes the PID file. +# +# * Checks if the 'www' user exists. If it does, then it displays +# a message. +# +# $FreeBSD$ +# + +# Make sure we're in the right stage of the process +if [ "$2" = "DEINSTALL" ]; then + # Kill Orion if it is still running + PID_FILE=/var/run/orion.pid + if [ -e ${PID_FILE} ]; then + echo -n "Orion Server is still running." + /bin/kill `cat ${PID_FILE}` + rm -f ${PID_FILE} + echo " Stopped." + fi fi + + +if [ "$2" = "POST-DEINSTALL" ]; then + # If the user exists, then display a message + if pw usershow "www" 2>/dev/null 1>&2; then + echo "To delete the www user permanently, use 'pw userdel www'" + fi +fi + +exit 0 |