From 518e0ec3586fef48cc7cfe0f91a85ff1f2304825 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Sun, 15 Mar 2009 20:54:16 -0400 Subject: [PATCH] Apply Debian initscript patch from David Paleino. --- in/init=debian=wicd.in | 6 +++++- in/init=pld=wicd.in | 2 +- setup.py | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/in/init=debian=wicd.in b/in/init=debian=wicd.in index 448d019..f08e836 100755 --- a/in/init=debian=wicd.in +++ b/in/init=debian=wicd.in @@ -18,14 +18,18 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin DESC="Network connection manager" NAME=wicd +RUNDIR=/var/run/$NAME DAEMON=%SBIN%$NAME DAEMON_ARGS="" -PIDFILE=%PIDFILE% +PIDFILE=$RUNDIR/wicd.pid SCRIPTNAME=%INIT%%INITFILENAME% # Exit if the package is not installed [ -x "$DAEMON" ] || exit 0 +# Create RUNDIR if it doesn't exist +[ -d "$RUNDIR" ] || mkdir -p "$RUNDIR" + # Read configuration variable file if it is present [ -r /etc/default/$NAME ] && . /etc/default/$NAME diff --git a/in/init=pld=wicd.in b/in/init=pld=wicd.in index 2d6d6ea..75ce3e2 100755 --- a/in/init=pld=wicd.in +++ b/in/init=pld=wicd.in @@ -8,7 +8,7 @@ # # processname: wicd # config: -# pidfile: /var/run/wicd.pid +# pidfile: %PIDFILE% # # $Id: template.init 9689 2008-03-27 16:15:39Z patrys $ diff --git a/setup.py b/setup.py index 80a1187..4b39c74 100755 --- a/setup.py +++ b/setup.py @@ -441,7 +441,6 @@ try: piddir = os.path.dirname(wpath.pidfile) if not piddir.endswith('/'): piddir += '/' - data.append (( piddir, [] )) if not wpath.no_install_docs: data.append((wpath.docdir, ['INSTALL', 'LICENSE', 'AUTHORS', 'README', 'CHANGES', ]))