Finally... the 100% of bacula spanish !!! ;-)

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

diff --git a/bacula/scripts/bacula-ctl-fd.in b/bacula/scripts/bacula-ctl-fd.in
index 6f0610074df15b32709d433200bca054e6f14bf3..093797eb74588630fa3a345b1e0e24166ec5bbd2 100644 (file)
--- a/bacula/scripts/bacula-ctl-fd.in
+++ b/bacula/scripts/bacula-ctl-fd.in
@@ -31,7 +31,7 @@ FD_PORT=@fd_port@
 
 FD_USER=@fd_user@
 FD_GROUP=@fd_group@
-
+Bacula="@BACULA@"
 PIDOF=@PIDOF@  
 
 # A function to stop a program.
@@ -61,27 +61,27 @@ killproc() {
    # Kill it.
    if [ "$pid" != "" ] ; then
       if [ "$notset" = "1" ] ; then
-        if ${PS} -p $pid>/dev/null 2>&1; then
+        if ${PS} -p "$pid">/dev/null 2>&1; then
             # TERM first, then KILL if not dead
             kill -TERM $pid 2>/dev/null
             sleep 1
-            if ${PS} -p $pid >/dev/null 2>&1 ; then
+            if ${PS} -p "$pid" >/dev/null 2>&1 ; then
                 sleep 1
-                if ${PS} -p $pid >/dev/null 2>&1 ; then
+                if ${PS} -p "$pid" >/dev/null 2>&1 ; then
                     sleep 3
-                    if ${PS} -p $pid >/dev/null 2>&1 ; then
+                    if ${PS} -p "$pid" >/dev/null 2>&1 ; then
                         kill -KILL $pid 2>/dev/null
                     fi
                 fi
             fi
          fi
-         ${PS} -p $pid >/dev/null 2>&1
+         ${PS} -p "$pid" >/dev/null 2>&1
          RC=$?
          [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
       #    RC=$((! $RC))
       # use specified level only
       else
-        if ${PS} -p $pid >/dev/null 2>&1; then
+        if ${PS} -p "$pid" >/dev/null 2>&1; then
            kill $killlevel $pid 2>/dev/null
            RC=$?
            [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
@@ -197,7 +197,7 @@ fi
 case "$1" in
    start)
       [ -x ${BACFDBIN}/bacula-fd ] && {
-        echo "Starting the Bacula File daemon"
+        echo "Starting the $Bacula File daemon"
         OPTIONS=''
         if [ "${FD_USER}" != '' ]; then
            OPTIONS="${OPTIONS} -u ${FD_USER}"
@@ -207,14 +207,14 @@ case "$1" in
            OPTIONS="${OPTIONS} -g ${FD_GROUP}"
         fi
 
-        ${BACFDBIN}/bacula-fd $2 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
+        ${BACFDBIN}/bacula-fd $2 $3 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
       }
       ;;
 
    stop)
       # Stop the FD first so that SD will fail jobs and update catalog
       [ -x ${BACFDBIN}/bacula-fd ] && {
-        echo "Stopping the Bacula File daemon"
+        echo "Stopping the $Bacula File daemon"
         killproc ${BACFDBIN}/bacula-fd ${FD_PORT}
       }
       ;;
@@ -226,7 +226,7 @@ case "$1" in
       ;;
 
    status)
-      [ -x ${BACFDBIN}/bacula-fd   ] && status ${BACFDBIN}/bacula-fd  ${FD_PORT}
+      [ -x ${BACFDBIN}/bacula-fd ] && status ${BACFDBIN}/bacula-fd  ${FD_PORT}
       ;;
 
    *)