Linux
/
obackup
mirror of https://github.com/deajan/obackup.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Another dev comment

This commit is contained in:
deajan 2016-12-23 17:59:58 +01:00
parent 6864cedb14
commit d48fe86d75
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dev/n_obackup.sh
View File

@ -344,7 +344,7 @@ function _ListRecursiveBackupDirectoriesLocal {
local cmd local cmd
local directories local directories
local directory local directory
local retval local retval=0
IFS=$PATH_SEPARATOR_CHAR read -r -a directories <<< "$RECURSIVE_DIRECTORY_LIST" IFS=$PATH_SEPARATOR_CHAR read -r -a directories <<< "$RECURSIVE_DIRECTORY_LIST"
for directory in "${directories[@]}"; do for directory in "${directories[@]}"; do
@ -362,8 +362,6 @@ function _ListRecursiveBackupDirectoriesLocal {
Logger "Error output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID.$TSTAMP)" "ERROR" Logger "Error output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID.$TSTAMP)" "ERROR"
fi fi
retval=1 retval=1
else
retval=0
fi fi
done done
return $retval return $retval
@ -383,7 +381,7 @@ include #### RemoteLogger SUBSET ####
function _ListRecursiveBackupDirectoriesRemoteSub { function _ListRecursiveBackupDirectoriesRemoteSub {
local directories local directories
local directory local directory
local retval local retval=0
IFS=$PATH_SEPARATOR_CHAR read -r -a directories <<< "$RECURSIVE_DIRECTORY_LIST" IFS=$PATH_SEPARATOR_CHAR read -r -a directories <<< "$RECURSIVE_DIRECTORY_LIST"
for directory in "${directories[@]}"; do for directory in "${directories[@]}"; do
@ -397,8 +395,6 @@ function _ListRecursiveBackupDirectoriesRemoteSub {
RemoteLogger "Error output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID.$TSTAMP)" "ERROR" RemoteLogger "Error output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID.$TSTAMP)" "ERROR"
fi fi
retval=1 retval=1
else
retval=0
fi fi
done done
return $retval return $retval
@ -419,6 +415,7 @@ function ListRecursiveBackupDirectories {
local excluded local excluded
local fileArray local fileArray
#TODO: Even with $? != 0, we should try to continue here if let's say retval=2 (or unless retval != 1 which would mean that no find command was successful)
Logger "Listing directories to backup." "NOTICE" Logger "Listing directories to backup." "NOTICE"
if [ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]; then if [ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]; then
_ListRecursiveBackupDirectoriesLocal _ListRecursiveBackupDirectoriesLocal