diff --git a/transfer.sh b/transfer.sh index cdddc3ff6a6012ed66c3e874a1fe85fc6cdd0f99..3921fe8edb930c6a237a53c72aa585f591acc172 100755 --- a/transfer.sh +++ b/transfer.sh @@ -331,87 +331,86 @@ function setAction(){ # -------------------------------------------------------------------------------- # ----- START BACKUPS ( - for mydir in $sDirs2Backup - do + if [ "$ACTION" = "backup" ]; then + for mydir in $sDirs2Backup + do - # remove ending slash ... otherwise duplicity will fail - mydir=`echo $mydir | sed 's#\/$##g'` + # remove ending slash ... otherwise duplicity will fail + mydir=`echo $mydir | sed 's#\/$##g'` - if [ -d "$mydir" ]; then + if [ -d "$mydir" ]; then - BACKUP_DIR=$mydir + BACKUP_DIR=$mydir - if [ "$ACTION" = "backup" ]; then - - h2 "`date` STORE $BACKUP_DIR" + h2 "`date` STORE $BACKUP_DIR" - # --- build parameters - sSafeName=`j_getSafename "$BACKUP_DIR"` - sTarget="$( t_backupDirGetTarget $BACKUP_DIR )" + # --- build parameters + sSafeName=`j_getSafename "$BACKUP_DIR"` + sTarget="$( t_backupDirGetTarget $BACKUP_DIR )" - ARGS_BACKUP="${sParamExclude} $( t_getParamBackup )" + ARGS_BACKUP="${sParamExclude} $( t_getParamBackup )" - # detect custom backup sets and add its includes and excludes - backupid=`j_getSetnameOfPath "$BACKUP_DIR"` - sSpaceReplace="___SPACE___" + # detect custom backup sets and add its includes and excludes + backupid=`j_getSetnameOfPath "$BACKUP_DIR"` + sSpaceReplace="___SPACE___" - if [ ! -z $backupid ]; then - for sItem in `_j_getvar ${DIRFILE} "${backupid}\-\-include" | sed "s#\ #${sSpaceReplace}#g"` - do - ARGS_BACKUP="${ARGS_BACKUP} $( t_getParamInlude $sItem)" - done - for sItem in `_j_getvar ${DIRFILE} "${backupid}\-\-exclude" | sed "s#\ #${sSpaceReplace}#g"` - do - ARGS_BACKUP="${ARGS_BACKUP} $( t_getParamExlude $sItem)" - done - fi + if [ ! -z $backupid ]; then + for sItem in `_j_getvar ${DIRFILE} "${backupid}\-\-include" | sed "s#\ #${sSpaceReplace}#g"` + do + ARGS_BACKUP="${ARGS_BACKUP} $( t_getParamInlude $sItem)" + done + for sItem in `_j_getvar ${DIRFILE} "${backupid}\-\-exclude" | sed "s#\ #${sSpaceReplace}#g"` + do + ARGS_BACKUP="${ARGS_BACKUP} $( t_getParamExlude $sItem)" + done + fi - # --- pre task - h3 "`date` PRE backup task for ${BACKUP_DIR}" - t_backupDirDoPreTasks - # sCmdPre="$( t_backupDirDoPreTasks )" + # --- pre task + h3 "`date` PRE backup task for ${BACKUP_DIR}" + t_backupDirDoPreTasks + # sCmdPre="$( t_backupDirDoPreTasks )" - # --- backup - h3 "`date` Backup ${BACKUP_DIR}" - if [ $doBackup -eq 0 ]; then - echo "SKIP backup" - else - sCmd="$( t_backupDirGetCmdBackup )" - echo "what: ${BACKUP_DIR}" - echo "target: ${sTarget}" - echo "command: $sCmd" - echo - color cmd - $sCmd - fetchrc - color reset - echo + # --- backup + h3 "`date` Backup ${BACKUP_DIR}" + if [ $doBackup -eq 0 ]; then + echo "SKIP backup" + else + sCmd="$( t_backupDirGetCmdBackup )" + echo "what: ${BACKUP_DIR}" + echo "target: ${sTarget}" + echo "command: $sCmd" + echo + color cmd + $sCmd + fetchrc + color reset + echo - t_rcCheckBackup $myrc "${BACKUP_DIR}" + t_rcCheckBackup $myrc "${BACKUP_DIR}" - fi - echo + fi + echo - # --- post action - h3 "`date` POST backup task for ${BACKUP_DIR}" - t_backupDirDoPostTasks - echo + # --- post action + h3 "`date` POST backup task for ${BACKUP_DIR}" + t_backupDirDoPostTasks + echo - touch ${lastbackupfile} - fi + touch ${lastbackupfile} - else - color warning - echo "DIR SKIP $mydir ... does not exist (no error)" - color reset - fi - echo - done + else + color warning + echo "DIR SKIP $mydir ... does not exist (no error)" + color reset + fi + echo + done + fi # --- prune if [ $doPrune -eq 0 ]; then