Linux/obackup
1
0
Fork 0
mirror of https://github.com/deajan/obackup.git synced 2026-02-12 18:10:56 +01:00
Code Issues Releases Wiki Activity

Rebuilt targets

Browse Source
This commit is contained in:
deajan
2016-08-08 16:35:11 +02:00
parent f7a3c4b3f0
commit 40af118c1e
3 changed files with 13 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dev/n_obackup.sh
View File

@@ -8,7 +8,7 @@ PROGRAM="obackup"
AUTHOR="(C) 2013-2016 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
PROGRAM_VERSION=2.1-dev
PROGRAM_BUILD=2016080703
PROGRAM_BUILD=2016080801
IS_STABLE=yes
source "./ofunctions.sh"
@@ -293,10 +293,6 @@ function _ListRecursiveBackupDirectoriesLocal {
local retval
IFS=$PATH_SEPARATOR_CHAR read -a directories <<< "$RECURSIVE_DIRECTORY_LIST"
#OLD_IFS=$IFS
#IFS=$PATH_SEPARATOR_CHAR
#TODO CHECK THIS
#for directory in $RECURSIVE_DIRECTORY_LIST
for directory in "${directories[@]}"; do
# No sudo here, assuming you should have all necessary rights for local checks
cmd="$FIND_CMD -L $directory/ -mindepth 1 -maxdepth 1 -type d >> $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID 2> $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID"
@@ -316,7 +312,6 @@ function _ListRecursiveBackupDirectoriesLocal {
retval=0
fi
done
#IFS=$OLD_IFS
return $retval
}
@@ -329,10 +324,6 @@ function _ListRecursiveBackupDirectoriesRemote {
local retval
IFS=$PATH_SEPARATOR_CHAR read -a directories <<< "$RECURSIVE_DIRECTORY_LIST"
#OLD_IFS=$IFS
#IFS=$PATH_SEPARATOR_CHAR
#TODO CHECK THIS
#for directory in $RECURSIVE_DIRECTORY_LIST
for directory in "${directories[@]}"; do
cmd=$SSH_CMD' "'$COMMAND_SUDO' '$REMOTE_FIND_CMD' -L '$directory'/ -mindepth 1 -maxdepth 1 -type d" >> '$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID' 2> '$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID
Logger "cmd: $cmd" "DEBUG"
@@ -351,7 +342,6 @@ function _ListRecursiveBackupDirectoriesRemote {
retval=0
fi
done
#IFS=$OLD_IFS
return $retval
}
@@ -741,7 +731,6 @@ function _BackupDatabaseLocalToRemote {
CheckConnectivity3rdPartyHosts
CheckConnectivityRemoteHost
#TODO-v2.0: cannot catch mysqldump warnings
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"
local sql_cmd="mysqldump -u $SQL_USER $export_options --database $database $COMPRESSION_PROGRAM $COMPRESSION_OPTIONS | $SSH_CMD '$COMMAND_SUDO tee \"$SQL_STORAGE/$database.sql$COMPRESSION_EXTENSION\" > /dev/null' 2> $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID"
@@ -938,15 +927,8 @@ function FilesBackup {
local backupTask
local backupTasks
#TODO: check this new behavior
IFS=$PATH_SEPARATOR_CHAR read -a backupTasks <<< "$FILE_BACKUP_TASKS"
for backupTask in "${backupTasks[@]}"; do
#OLD_IFS=$IFS
#IFS=$PATH_SEPARATOR_CHAR
# Backup non recursive directories
#for BACKUP_TASK in $FILE_BACKUP_TASKS
#do
Logger "Beginning file backup of [$backupTask]." "NOTICE"
if [ "$ENCRYPTION" == "yes" ]; then
Duplicity "$backupTask" "recurse"
@@ -958,10 +940,6 @@ function FilesBackup {
IFS=$PATH_SEPARATOR_CHAR read -a backupTasks <<< "$RECURSIVE_DIRECTORY_LIST"
for backupTask in "${backupTasks[@]}"; do
## Backup files at root of DIRECTORIES_RECURSE_LIST directories
#for BACKUP_TASK in $RECURSIVE_DIRECTORY_LIST
#do
Logger "Beginning non recursive file backup of [$backupTask]." "NOTICE"
if [ "$ENCRYPTION" == "yes" ]; then
Duplicity "$backupTask" "no-recurse"