From f0eee8897f8ad19dc0c4a47f8c7e79fbf694cfef Mon Sep 17 00:00:00 2001 From: deajan Date: Sun, 30 Sep 2018 17:06:13 +0200 Subject: [PATCH] Rebuilt targets --- dev/debug_obackup.sh | 21 +++++++++++---------- obackup.sh | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dev/debug_obackup.sh b/dev/debug_obackup.sh index 65b189a..e19dad0 100755 --- a/dev/debug_obackup.sh +++ b/dev/debug_obackup.sh @@ -7,7 +7,7 @@ PROGRAM="obackup" AUTHOR="(C) 2013-2018 by Orsiris de Jong" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" PROGRAM_VERSION=2.1-RC1 -PROGRAM_BUILD=2018093005 +PROGRAM_BUILD=2018093006 IS_STABLE=no #### Execution order #__WITH_PARANOIA_DEBUG @@ -4583,7 +4583,8 @@ function _RotateBackupsRemoteSSH { RemoteLogger "Command was [$cmd]." "WARN" fi - elif [ "$REMOTE_OPERATION" == "yes" ]; then + else + #elif [ "$REMOTE_OPERATION" == "yes" ]; then cmd="cp -R \"$backup\" \"$backup.$PROGRAM.1\"" RemoteLogger "Launching command [$cmd]." "DEBUG" eval "$cmd" @@ -4592,14 +4593,14 @@ function _RotateBackupsRemoteSSH { RemoteLogger "Command was [$cmd]." "WARN" fi - else - cmd="mv \"$backup\" \"$backup.$PROGRAM.1\"" - RemoteLogger "Launching command [$cmd]." "DEBUG" - eval "$cmd" - if [ $? -ne 0 ]; then - RemoteLogger "Cannot move [$backup] to [$backup.$PROGRAM.1]." "ERROR" - RemoteLogger "Command was [$cmd]." "WARN" - fi + #else + # cmd="mv \"$backup\" \"$backup.$PROGRAM.1\"" + # RemoteLogger "Launching command [$cmd]." "DEBUG" + # eval "$cmd" + # if [ $? -ne 0 ]; then + # RemoteLogger "Cannot move [$backup] to [$backup.$PROGRAM.1]." "ERROR" + # RemoteLogger "Command was [$cmd]." "WARN" + # fi fi done } diff --git a/obackup.sh b/obackup.sh index e51a063..faeed3f 100755 --- a/obackup.sh +++ b/obackup.sh @@ -7,7 +7,7 @@ PROGRAM="obackup" AUTHOR="(C) 2013-2018 by Orsiris de Jong" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" PROGRAM_VERSION=2.1-RC1 -PROGRAM_BUILD=2018093005 +PROGRAM_BUILD=2018093006 IS_STABLE=no @@ -4363,7 +4363,8 @@ function _RotateBackupsRemoteSSH { RemoteLogger "Command was [$cmd]." "WARN" fi - elif [ "$REMOTE_OPERATION" == "yes" ]; then + else + #elif [ "$REMOTE_OPERATION" == "yes" ]; then cmd="cp -R \"$backup\" \"$backup.$PROGRAM.1\"" RemoteLogger "Launching command [$cmd]." "DEBUG" eval "$cmd" @@ -4372,14 +4373,14 @@ function _RotateBackupsRemoteSSH { RemoteLogger "Command was [$cmd]." "WARN" fi - else - cmd="mv \"$backup\" \"$backup.$PROGRAM.1\"" - RemoteLogger "Launching command [$cmd]." "DEBUG" - eval "$cmd" - if [ $? -ne 0 ]; then - RemoteLogger "Cannot move [$backup] to [$backup.$PROGRAM.1]." "ERROR" - RemoteLogger "Command was [$cmd]." "WARN" - fi + #else + # cmd="mv \"$backup\" \"$backup.$PROGRAM.1\"" + # RemoteLogger "Launching command [$cmd]." "DEBUG" + # eval "$cmd" + # if [ $? -ne 0 ]; then + # RemoteLogger "Cannot move [$backup] to [$backup.$PROGRAM.1]." "ERROR" + # RemoteLogger "Command was [$cmd]." "WARN" + # fi fi done }