From 49748686b9a3e2f58ee5a5b15f4b50bd24d56f28 Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 16 Aug 2016 22:54:52 +0200 Subject: [PATCH] Rebuilt Targets --- dev/debug_obackup.sh | 6 +++--- obackup.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/debug_obackup.sh b/dev/debug_obackup.sh index ab57c44..537bcea 100755 --- a/dev/debug_obackup.sh +++ b/dev/debug_obackup.sh @@ -32,8 +32,7 @@ _DRYRUN=0 _SILENT=0 _LOGGER_PREFIX="date" _LOGGER_STDERR=0 - -if [ $(isNumeric "$KEEP_LOGGING") -ne 1 ]; then +if [ "$KEEP_LOGGING" == "" ]; then KEEP_LOGGING=1801 fi @@ -215,6 +214,7 @@ function KillChilds { function KillAllChilds { local pids="${1}" # List of parent pids to kill separated by semi-colon + local self="${2:-false}" # Should parent be killed too ? __CheckArguments 1 $# ${FUNCNAME[0]} "$@" #__WITH_PARANOIA_DEBUG @@ -222,7 +222,7 @@ function KillAllChilds { IFS=';' read -a pidsArray <<< "$pids" for pid in "${pidsArray[@]}"; do - KillChilds $pid + KillChilds $pid $self if [ $? != 0 ]; then errorcount=$((errorcount+1)) fi diff --git a/obackup.sh b/obackup.sh index 3ffec13..9dbdb60 100755 --- a/obackup.sh +++ b/obackup.sh @@ -32,8 +32,7 @@ _DRYRUN=0 _SILENT=0 _LOGGER_PREFIX="date" _LOGGER_STDERR=0 - -if [ $(isNumeric "$KEEP_LOGGING") -ne 1 ]; then +if [ "$KEEP_LOGGING" == "" ]; then KEEP_LOGGING=1801 fi @@ -202,13 +201,14 @@ function KillChilds { function KillAllChilds { local pids="${1}" # List of parent pids to kill separated by semi-colon + local self="${2:-false}" # Should parent be killed too ? local errorcount=0 IFS=';' read -a pidsArray <<< "$pids" for pid in "${pidsArray[@]}"; do - KillChilds $pid + KillChilds $pid $self if [ $? != 0 ]; then errorcount=$((errorcount+1)) fi