diff --git a/dev/debug_obackup.sh b/dev/debug_obackup.sh index 451c9d0..8fca80c 100755 --- a/dev/debug_obackup.sh +++ b/dev/debug_obackup.sh @@ -5,7 +5,7 @@ PROGRAM="obackup" AUTHOR="(C) 2013-2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" PROGRAM_VERSION=2.0-RC1 -PROGRAM_BUILD=2016052601 +PROGRAM_BUILD=2016071901 IS_STABLE=yes ## FUNC_BUILD=2016071901 @@ -1933,6 +1933,7 @@ function _BackupDatabaseLocalToLocal { local dry_sql_cmd local sql_cmd + local retval __CheckArguments 2 $# ${FUNCNAME[0]} "$@" #__WITH_PARANOIA_DEBUG @@ -1947,7 +1948,7 @@ function _BackupDatabaseLocalToLocal { eval "$dry_sql_cmd" & fi WaitForTaskCompletion $! $SOFT_MAX_EXEC_TIME_DB_TASK $HARD_MAX_EXEC_TIME_DB_TASK ${FUNCNAME[0]} - local retval=$? + retval=$? if [ -s "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID" ]; then Logger "Error output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID)" "ERROR" fi @@ -1962,6 +1963,7 @@ function _BackupDatabaseLocalToRemote { local dry_sql_cmd local sql_cmd + local retval CheckConnectivity3rdPartyHosts CheckConnectivityRemoteHost @@ -1978,7 +1980,7 @@ function _BackupDatabaseLocalToRemote { eval "$dry_sql_cmd" & fi WaitForTaskCompletion $! $SOFT_MAX_EXEC_TIME_DB_TASK $HARD_MAX_EXEC_TIME_DB_TASK ${FUNCNAME[0]} - local retval=$? + retval=$? if [ -s "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID" ]; then Logger "Error output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID)" "ERROR" fi diff --git a/dev/n_obackup.sh b/dev/n_obackup.sh index a7ea2a3..11f257d 100755 --- a/dev/n_obackup.sh +++ b/dev/n_obackup.sh @@ -5,7 +5,7 @@ PROGRAM="obackup" AUTHOR="(C) 2013-2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" PROGRAM_VERSION=2.0-RC1 -PROGRAM_BUILD=2016052601 +PROGRAM_BUILD=2016071901 IS_STABLE=yes source "./ofunctions.sh" @@ -689,6 +689,7 @@ function _BackupDatabaseLocalToLocal { local dry_sql_cmd local sql_cmd + local retval __CheckArguments 2 $# ${FUNCNAME[0]} "$@" #__WITH_PARANOIA_DEBUG @@ -703,7 +704,7 @@ function _BackupDatabaseLocalToLocal { eval "$dry_sql_cmd" & fi WaitForTaskCompletion $! $SOFT_MAX_EXEC_TIME_DB_TASK $HARD_MAX_EXEC_TIME_DB_TASK ${FUNCNAME[0]} - local retval=$? + retval=$? if [ -s "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID" ]; then Logger "Error output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID)" "ERROR" fi @@ -718,6 +719,7 @@ function _BackupDatabaseLocalToRemote { local dry_sql_cmd local sql_cmd + local retval CheckConnectivity3rdPartyHosts CheckConnectivityRemoteHost @@ -734,7 +736,7 @@ function _BackupDatabaseLocalToRemote { eval "$dry_sql_cmd" & fi WaitForTaskCompletion $! $SOFT_MAX_EXEC_TIME_DB_TASK $HARD_MAX_EXEC_TIME_DB_TASK ${FUNCNAME[0]} - local retval=$? + retval=$? if [ -s "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID" ]; then Logger "Error output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID)" "ERROR" fi diff --git a/obackup.sh b/obackup.sh index 840bd43..ea34ed7 100755 --- a/obackup.sh +++ b/obackup.sh @@ -5,7 +5,7 @@ PROGRAM="obackup" AUTHOR="(C) 2013-2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" PROGRAM_VERSION=2.0-RC1 -PROGRAM_BUILD=2016052601 +PROGRAM_BUILD=2016071901 IS_STABLE=yes ## FUNC_BUILD=2016071901 @@ -1841,6 +1841,7 @@ function _BackupDatabaseLocalToLocal { local dry_sql_cmd local sql_cmd + local retval local dry_sql_cmd="mysqldump -u $SQL_USER $export_options --database $database $COMPRESSION_PROGRAM $COMPRESSION_OPTIONS > /dev/null 2> $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID" @@ -1854,7 +1855,7 @@ function _BackupDatabaseLocalToLocal { eval "$dry_sql_cmd" & fi WaitForTaskCompletion $! $SOFT_MAX_EXEC_TIME_DB_TASK $HARD_MAX_EXEC_TIME_DB_TASK ${FUNCNAME[0]} - local retval=$? + retval=$? if [ -s "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID" ]; then Logger "Error output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID)" "ERROR" fi @@ -1868,6 +1869,7 @@ function _BackupDatabaseLocalToRemote { local dry_sql_cmd local sql_cmd + local retval CheckConnectivity3rdPartyHosts CheckConnectivityRemoteHost @@ -1884,7 +1886,7 @@ function _BackupDatabaseLocalToRemote { eval "$dry_sql_cmd" & fi WaitForTaskCompletion $! $SOFT_MAX_EXEC_TIME_DB_TASK $HARD_MAX_EXEC_TIME_DB_TASK ${FUNCNAME[0]} - local retval=$? + retval=$? if [ -s "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID" ]; then Logger "Error output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID)" "ERROR" fi