Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b85148ccab1b8ef5373505d1aee7cff48978f8b
commit 2b85148ccab1b8ef5373505d1aee7cff48978f8b Author: Miklos Vajna <vmik...@frugalware.org> Date: Sat Jun 6 17:02:40 2009 +0200 proftpd-1.3.2-4-i686 - convert init script to Frcd2 - closes #3797 diff --git a/source/network/proftpd/FrugalBuild b/source/network/proftpd/FrugalBuild index fee2197..1888b55 100644 --- a/source/network/proftpd/FrugalBuild +++ b/source/network/proftpd/FrugalBuild @@ -5,7 +5,7 @@ pkgname=proftpd pkgver=1.3.2 pkgextraver= -pkgrel=3 +pkgrel=4 pkgdesc="Highly configurable GPL-licensed FTP server software" url="http://www.proftpd.org/" groups=('network') @@ -40,7 +40,7 @@ build() Frm /etc/* Ffile /etc/proftpd.conf Ffile /etc/ftpusers - Frcd + Frcd2 } # optimization OK diff --git a/source/network/proftpd/messages/proftpd.en b/source/network/proftpd/messages/proftpd.en deleted file mode 100644 index c934f3d..0000000 --- a/source/network/proftpd/messages/proftpd.en +++ /dev/null @@ -1,2 +0,0 @@ -stopproftp="Stopping ProFTPd Server" -startproftp="Starting ProFTPd Server" diff --git a/source/network/proftpd/messages/proftpd.hu b/source/network/proftpd/messages/proftpd.hu deleted file mode 100644 index 30bef0d..0000000 --- a/source/network/proftpd/messages/proftpd.hu +++ /dev/null @@ -1,2 +0,0 @@ -stopproftp="A ProFTPd szerver leállítása" -startproftp="A ProFTPd szerver indítása" diff --git a/source/network/proftpd/rc.proftpd b/source/network/proftpd/rc.proftpd index cd5d450..a3e3716 100644 --- a/source/network/proftpd/rc.proftpd +++ b/source/network/proftpd/rc.proftpd @@ -1,25 +1,42 @@ -#!/bin/sh +#!/bin/bash -# (c) 2003 Vajna Miklos <vmik...@frugalware.org> -# rc.proftpd for FrugalWare +# (c) 2003, 2009 Miklos Vajna <vmik...@frugalware.org> +# rc.proftpd for Frugalware # distributed under GPL License -. /etc/rc.d/rc.functions - # chkconfig: 2345 60 50 # description: ProFTPd is a ftp daemon, which is the program \ # that answers incoming ftp service requests. -if [ "$1" = "stop" ]; then - stop "$stopproftp" - killall proftpd - ok $? -elif [ "$1" = "restart" ]; then - "$0" stop - sleep 1 - "$0" start -else # start - start "$startproftp" - proftpd - ok $? -fi +source /lib/initscripts/functions +TEXTDOMAIN=proftpd +TEXTDOMAINDIR=/lib/initscripts/messages + +actions=(restart status start stop) +daemon=$"ProFTPd Server" + +pid="cat /var/run/proftpd.pid 2>/dev/null" + +rc_start() +{ + start_msg + if [ -z "$(eval $pid)" ]; then + proftpd + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [ -n "$(eval $pid)" ]; then + kill "$(eval $pid)" + ok $? + else + ok 999 + fi +} + +rc_exec $1
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git