[Python-apps-commits] r9699 - in packages/sabnzbdplus/trunk/debian (2 files)
jcfp-guest at users.alioth.debian.org
jcfp-guest at users.alioth.debian.org
Sat Jun 1 14:24:08 UTC 2013
Date: Saturday, June 1, 2013 @ 14:24:06
Author: jcfp-guest
Revision: 9699
Init: use filenames based on script name
Modified:
packages/sabnzbdplus/trunk/debian/changelog
packages/sabnzbdplus/trunk/debian/sabnzbdplus.init
Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog 2013-05-30 06:15:18 UTC (rev 9698)
+++ packages/sabnzbdplus/trunk/debian/changelog 2013-06-01 14:24:06 UTC (rev 9699)
@@ -3,13 +3,15 @@
[ JCF Ploemen (jcfp) ]
* New upstream release.
* Desktop file: add keywords.
- * Init script: improve dependency based booting params.
+ * Init script:
+ + improve dependency based booting params.
+ + base external filenames on the script's name.
* Tweak version of python build-dep (appending ~).
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- JCF Ploemen (jcfp) <linux at jcf.pm> Tue, 28 May 2013 22:43:07 +0200
+ -- JCF Ploemen (jcfp) <linux at jcf.pm> Sat, 01 Jun 2013 15:48:30 +0200
sabnzbdplus (0.7.11-1) experimental; urgency=low
Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.init
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.init 2013-05-30 06:15:18 UTC (rev 9698)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.init 2013-06-01 14:24:06 UTC (rev 9699)
@@ -24,16 +24,16 @@
# service, starting the program on boot.
### END INIT INFO
-DAEMON=/usr/bin/sabnzbdplus
-SETTINGS=/etc/default/sabnzbdplus
+NAME="$(basename $0)"
+DAEMON="/usr/bin/sabnzbdplus"
+SETTINGS="/etc/default/$NAME"
-([ -x $DAEMON ] && [ -r $SETTINGS ]) || exit 0
+([ -x "$DAEMON" ] && [ -r "$SETTINGS" ]) || exit 0
DESC="SABnzbd+ binary newsgrabber"
DEFOPTS="--daemon"
-PYTHONEXEC="^$(sed -n '1s/^#\! \?\([a-z0-9\.\/]\+\)\(.*\)/\1(\2)?/p' $DAEMON)"
-PIDFILE=/var/run/sabnzbdplus.pid
-SETTINGS_LOADED=FALSE
+PYTHONEXEC="^$(sed -n '1s/^#\! \?\([a-z0-9\.\/]\+\)\(.*\)/\1(\2)?/p' "$DAEMON")"
+PIDFILE="/var/run/$NAME.pid"
# these are only accepted from the settings file
unset USER CONFIG HOST PORT EXTRAOPTS
@@ -58,13 +58,13 @@
}
load_settings() {
- if [ $SETTINGS_LOADED != "TRUE" ]; then
- . $SETTINGS
+ if [ -z "$USER" ]; then
+ . "$SETTINGS"
- [ -z "$USER" ] && {
- log_warning_msg "$DESC: not configured, aborting. See $SETTINGS";
- return 1; }
- [ -z "${USER%:*}" ] && exit 1
+ [ -z "$USER" ] || [ -z "${USER%:*}" ] && {
+ log_warning_msg "$DESC: service not enabled; edit $SETTINGS";
+ return 1;
+ }
OPTIONS="$DEFOPTS"
[ -n "$CONFIG" ] && OPTIONS="$OPTIONS --config-file $CONFIG"
@@ -72,7 +72,6 @@
[ -n "$PORT" ] && SERVER="$SERVER:$PORT"
[ -n "$SERVER" ] && OPTIONS="$OPTIONS --server $SERVER"
[ -n "$EXTRAOPTS" ] && OPTIONS="$OPTIONS $EXTRAOPTS"
- SETTINGS_LOADED=TRUE
fi
return 0
}
@@ -84,8 +83,8 @@
start-stop-daemon --quiet --chuid $USER --start --exec $DAEMON -- $OPTIONS
check_retval
# create a pidfile; we don't use it but some monitoring app likes to have one
- [ -w $(dirname $PIDFILE) ] && \
- pgrep -f -x -n -u ${USER%:*} "$PYTHONEXEC $DAEMON $OPTIONS" > $PIDFILE
+ [ -w $(dirname "$PIDFILE") ] && \
+ pgrep -f -x -n -u ${USER%:*} "$PYTHONEXEC $DAEMON $OPTIONS" > "$PIDFILE"
else
log_success_msg "$DESC: already running (pid $PID)"
fi
@@ -104,7 +103,7 @@
else
log_success_msg "$DESC: not running"
fi
- [ -f $PIDFILE ] && rm -f $PIDFILE
+ [ -f "$PIDFILE" ] && rm -f "$PIDFILE"
}
case "$1" in
@@ -124,7 +123,7 @@
log_success_msg "$DESC: running (pid $PID)"
else
log_success_msg "$DESC: not running"
- [ -f $PIDFILE ] && exit 1 || exit 3
+ [ -f "$PIDFILE" ] && exit 1 || exit 3
fi
;;
*)
More information about the Python-apps-commits
mailing list