diff --git a/ccollect.sh b/ccollect.sh index c8e7525..c9dfe52 100755 --- a/ccollect.sh +++ b/ccollect.sh @@ -102,7 +102,7 @@ while [ $i -le $# ]; do VERBOSE=1 ;; -p|--parallel) - PARALLEL="&" + PARALLEL="1" ;; -h|--help) usage @@ -303,10 +303,19 @@ while [ "$i" -lt "$no_shares" ]; do # stdecho "Transferring files..." - rsync -a $VERBOSE $RSYNC_EXTRA $EXCLUDE \ - --delete --numeric-ids --relative --delete-excluded \ - "$source" "$destination_dir" 2>&1 $PARALLEL | add_name - + + # non parallel + if [ -z "$PARALLEL" ]; then + rsync -a $VERBOSE $RSYNC_EXTRA $EXCLUDE \ + --delete --numeric-ids --relative --delete-excluded \ + "$source" "$destination_dir" 2>&1 | add_name + # parallel execution + else + (rsync -a $VERBOSE $RSYNC_EXTRA $EXCLUDE \ + --delete --numeric-ids --relative --delete-excluded \ + "$source" "$destination_dir" 2>&1 | add_name ) & + fi + if [ $? -ne 0 ]; then errecho "rsync failed, backup may be broken (see rsync errors)" continue diff --git a/conf/sources/testsource1/source b/conf/sources/testsource1/source index 7e6dd53..f8ea6e1 100644 --- a/conf/sources/testsource1/source +++ b/conf/sources/testsource1/source @@ -1 +1 @@ -/home/nico/tmp +/home/nico/bilder