Add Phil Stracchino's fix for Qt5

[bacula/bacula] / bacula / scripts / bacula-ctl-dir.in

diff --git a/bacula/scripts/bacula-ctl-dir.in b/bacula/scripts/bacula-ctl-dir.in
index 65cb8883e9406d1bdeaf17c96e37b044aca57fcf..ab1eaaca12451a1e7cb8397dc057f2624e324396 100644 (file)
--- a/bacula/scripts/bacula-ctl-dir.in
+++ b/bacula/scripts/bacula-ctl-dir.in
@@ -1,5 +1,22 @@
 #! /bin/sh
 #
+#   Bacula(R) - The Network Backup Solution
+#
+#   Copyright (C) 2000-2016 Kern Sibbald
+#
+#   The original author of Bacula is Kern Sibbald, with contributions
+#   from many others, a complete list can be found in the file AUTHORS.
+#
+#   You may use this file and others of this release according to the
+#   license defined in the LICENSE file, which includes the Affero General
+#   Public License, v3.0 ("AGPLv3") and some additional permissions and
+#   terms pursuant to its AGPLv3 Section 7.
+#
+#   This notice must be preserved when any source code is 
+#   conveyed and/or propagated.
+#
+#   Bacula(R) is a registered trademark of Kern Sibbald.
+#
 # bacula-ctl-dir This shell script takes care of starting and stopping
 #               the bacula Director daemon
 #
@@ -8,6 +25,9 @@
 #
 # description: The Leading Open Source Backup Solution.
 #
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 
 PSCMD="@PSCMD@"
 PS="ps"
@@ -208,7 +228,7 @@ case "$1" in
            OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
         fi
 
-        if [ "x${VALGRIND}" = "x1" ]; then
+        if [ "x${VALGRIND_DIR}" = "x1" ]; then
            valgrind --leak-check=full ${BACDIRBIN}/bacula-dir $2 $3 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
         else
            ${BACDIRBIN}/bacula-dir $2 $3 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
@@ -220,7 +240,7 @@ case "$1" in
    stop)
       [ -x ${BACDIRBIN}/bacula-dir ] && {
         echo "Stopping the $Bacula Director daemon"
-        killproc ${BACDIRBIN}/bacula-dir ${DIR_PORT}
+        killproc ${BACDIRBIN}/bacula-dir ${DIR_PORT} $2
       }
       ;;