Merge branch 'Almad/master'

Author: Ask Solem

contrib/debian/init.d/celerybeat

@@ -146,7 +146,7 @@ stop_worker () {
                            --quiet \
                            $* \
                            --pidfile $CELERYBEAT_PID_FILE"
-    if `$cmd`; then
+    if $cmd; then
         log_end_msg 0
     else
         log_end_msg 1
@@ -162,7 +162,7 @@ start_worker () {
                            $* \
                            --pidfile $CELERYBEAT_PID_FILE
                            --exec $CELERYBEAT -- $CELERYBEAT_OPTS"
-    if `$cmd`; then
+    if $cmd; then
         log_end_msg 0
     else
         log_end_msg 1

contrib/debian/init.d/celeryd

@@ -80,7 +80,7 @@ set -e
 CELERYD_PID_FILE="/var/run/celeryd.pid"
 CELERYD_LOG_FILE="/var/log/celeryd.log"
 CELERYD_LOG_LEVEL="INFO"
-DEFAULT_CELERYD="celeryd"
+DEFAULT_CELERYD="/usr/bin/celeryd"
 
 # /etc/init.d/ssh: start and stop the celery task worker daemon.
 
@@ -140,7 +140,7 @@ stop_worker () {
                            --quiet \
                            $* \
                            --pidfile $CELERYD_PID_FILE"
-    if `$cmd`; then
+    if $cmd; then
         log_end_msg 0
     else
         log_end_msg 1
@@ -156,7 +156,7 @@ start_worker () {
                            $* \
                            --pidfile $CELERYD_PID_FILE
                            --exec $CELERYD -- $CELERYD_OPTS"
-    if `$cmd`; then
+    if $cmd; then
         log_end_msg 0
     else
         log_end_msg 1