diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2011-02-04 19:45:46 +0800 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2011-02-04 19:45:46 +0800 |
| commit | 2e70553408f76e25fc6ae4e672df4e73af1df54f (patch) | |
| tree | d6ef009bc4a9712deef3ec1800325302e0bcc84b /mail | |
| parent | 8c3f9530af4f5264a620f5b1393fa6255b8503be (diff) | |
| download | freebsd-ports-gnome-2e70553408f76e25fc6ae4e672df4e73af1df54f.tar.gz freebsd-ports-gnome-2e70553408f76e25fc6ae4e672df4e73af1df54f.tar.zst freebsd-ports-gnome-2e70553408f76e25fc6ae4e672df4e73af1df54f.zip | |
Improve rc-script after suggestions from dougb
Feature safe: yes
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/bincimap/Makefile | 2 | ||||
| -rw-r--r-- | mail/bincimap/files/bincimapd.in | 30 |
2 files changed, 18 insertions, 14 deletions
diff --git a/mail/bincimap/Makefile b/mail/bincimap/Makefile index fc945b2743c5..8def776428d5 100644 --- a/mail/bincimap/Makefile +++ b/mail/bincimap/Makefile @@ -12,7 +12,7 @@ PORTNAME= bincimap PORTVERSION= 1.2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.bincimap.org/%SUBDIR%/ \ http://www.bincimap.andreas.hanssen.name/%SUBDIR%/ \ diff --git a/mail/bincimap/files/bincimapd.in b/mail/bincimap/files/bincimapd.in index 5b8e8a4c6f6e..083c13eeab3a 100644 --- a/mail/bincimap/files/bincimapd.in +++ b/mail/bincimap/files/bincimapd.in @@ -1,9 +1,12 @@ #!/bin/sh # +# $FreeBSD$ +# # Copyright 2007, AnyWi Technologies # # PROVIDE: bincimapd # REQUIRE: LOGIN cleanvar +# KEYWORD: shutdown # # Note: tcpserver can be found in the sysutils/ucspi-tcp package. . /etc/rc.subr @@ -22,20 +25,21 @@ load_rc_config $name bincimapd_start() { - echo -n "Starting bincimapd: " - $bincimapd_tcpserver $bincimapd_tcpserver_flags $bincimapd_host $bincimapd_port \ - %%PREFIX%%/bin/bincimap-up --conf=$bincimapd_conf -- \ - %%PREFIX%%/bin/checkpassword-pam -s imap -- %%PREFIX%%/bin/bincimapd & - echo $! > $bincimapd_pidfile - echo "." -} - -bincimapd_stop() -{ - echo "Stopping bincimapd" - pkill -F $bincimapd_pidfile + rc_pid=$(check_pidfile ${pidfile} ${bincimapd_tcpserver}) + if [ -z "$rc_pid" ]; then + echo -n "Starting bincimapd: " + $bincimapd_tcpserver $bincimapd_tcpserver_flags $bincimapd_host $bincimapd_port \ + %%PREFIX%%/bin/bincimap-up --conf=$bincimapd_conf -- \ + %%PREFIX%%/bin/checkpassword-pam -s imap -- %%PREFIX%%/bin/bincimapd & + echo $! > $bincimapd_pidfile + echo "." + else + echo "${name} already running? (check ${pidfile}" + return 1 + fi } start_cmd="bincimapd_start" -stop_cmd="bincimapd_stop" +command=${bincimapd_tcpserver} +pidfile=${bincimapd_pidfile} run_rc_command "$1" |