Browse files

Adding help and checks to the new ubuntu init and cosmetic fixes:

* Extended the if statement checking for the new config to alert if no default config exist, before starting with defaults.
* The new defaults file setup changes the variable names and they can confuse some, added comments to clarify.
* Added cosmetic changes to the comments so capitalization is now the same everywhere and cleaned up indentation so they are the same
  • Loading branch information...
1 parent 8843793 commit 3c0c11429432b0625864ce48272261542b232e1d @psarossy psarossy committed Sep 11, 2012
Showing with 27 additions and 25 deletions.
  1. +27 −25 init.ubuntu
View
52 init.ubuntu
@@ -14,38 +14,40 @@
# Source SickBeard configuration
if [ -f /etc/default/sickbeard ]; then
- . /etc/default/sickbeard
+ . /etc/default/sickbeard
+else
+ echo "/etc/default/sickbeard not found using default settings.";
fi
-# script name
+# Script name
NAME=sickbeard
-# app name
+# App name
DESC=SickBeard
## Don't edit this file
## Edit user configuation in /etc/default/sickbeard to change
##
-## SB_USER=
-## SB_HOME=
-## SB_DATA=
-## SB_PIDFILE=
-## PYTHON_BIN=
-## SB_OPTS=
-## SSD_OPTS=
+## SB_USER= #$RUN_AS, username to run sickbeard under, the default is sickbeard
+## SB_HOME= #$APP_PATH, the location of SickBeard.py, the default is /opt/sickbeard
+## SB_DATA= #$DATA_DIR, the location of sickbeard.db, cache, logs, the default is /opt/sickbeard
+## SB_PIDFILE= #$PID_FILE, the location of sickbeard.pid, the default is /var/run/sickbeard/sickbeard.pid
+## PYTHON_BIN= #$DAEMON, the location of the python binary, the default is /usr/bin/python
+## SB_OPTS= #$EXTRA_DAEMON_OPTS, extra cli option for sickbeard, i.e. " --config=/home/sickbeard/config.ini"
+## SSD_OPTS= #$EXTRA_SSD_OPTS, extra start-stop-daemon option like " --group=users"
##
## EXAMPLE if want to run as different user
## add SB_USER=username to /etc/default/sickbeard
## otherwise default sickbeard is used
-## the defaults
+## The defaults
# Run as username
RUN_AS=${SB_USER-sickbeard}
-# path to app SB_APP=path_to_app_SickBeard.py
+# Path to app SB_HOME=path_to_app_SickBeard.py
APP_PATH=${SB_HOME-/opt/sickbeard}
-# data directory where sickbeard.db, cache and logs are stored
+# Data directory where sickbeard.db, cache and logs are stored
DATA_DIR=${SB_DATA-/opt/sickbeard}
# Path to store PID file
@@ -54,10 +56,10 @@ PID_FILE=${SB_PIDFILE-/var/run/sickbeard/sickbeard.pid}
# path to python bin
DAEMON=${PYTHON_BIN-/usr/bin/python}
-# extra daemon option like: SB_OPTS=" --config=/home/sickbeard/config.ini"
+# Extra daemon option like: SB_OPTS=" --config=/home/sickbeard/config.ini"
EXTRA_DAEMON_OPTS=${SB_OPTS-}
-# extra start-stop-daemon option like START_OPTS=" --group=users"
+# Extra start-stop-daemon option like START_OPTS=" --group=users"
EXTRA_SSD_OPTS=${SSD_OPTS-}
##
@@ -70,7 +72,7 @@ test -x $DAEMON || exit 0
set -e
-# create PID directory if not exist and ensure the SickBeard user can write to it
+# Create PID directory if not exist and ensure the SickBeard user can write to it
if [ ! -d $PID_PATH ]; then
mkdir -p $PID_PATH
chown $RUN_AS $PID_PATH
@@ -82,29 +84,29 @@ if [ ! -d $DATA_DIR ]; then
fi
if [ -e $PID_FILE ]; then
- PID=`cat $PID_FILE`
- if ! kill -0 $PID > /dev/null 2>&1; then
- echo "Removing stale $PID_FILE"
- rm $PID_FILE
- fi
+ PID=`cat $PID_FILE`
+ if ! kill -0 $PID > /dev/null 2>&1; then
+ echo "Removing stale $PID_FILE"
+ rm $PID_FILE
+ fi
fi
case "$1" in
- start)
+ start)
echo "Starting $DESC"
start-stop-daemon -d $APP_PATH -c $RUN_AS $EXTRA_SSD_OPTS --start --pidfile $PID_FILE --exec $DAEMON -- $DAEMON_OPTS
;;
- stop)
+ stop)
echo "Stopping $DESC"
start-stop-daemon --stop --pidfile $PID_FILE --retry 15
;;
- restart|force-reload)
+ restart|force-reload)
echo "Restarting $DESC"
start-stop-daemon --stop --pidfile $PID_FILE --retry 15
start-stop-daemon -d $APP_PATH -c $RUN_AS $EXTRA_SSD_OPTS --start --pidfile $PID_FILE --exec $DAEMON -- $DAEMON_OPTS
;;
- *)
+ *)
N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1

0 comments on commit 3c0c114

Please sign in to comment.