Added more correct, still broken parallel execution
This commit is contained in:
parent
687e0b6a68
commit
9b36bff9a0
2 changed files with 15 additions and 6 deletions
19
ccollect.sh
19
ccollect.sh
|
@ -102,7 +102,7 @@ while [ $i -le $# ]; do
|
||||||
VERBOSE=1
|
VERBOSE=1
|
||||||
;;
|
;;
|
||||||
-p|--parallel)
|
-p|--parallel)
|
||||||
PARALLEL="&"
|
PARALLEL="1"
|
||||||
;;
|
;;
|
||||||
-h|--help)
|
-h|--help)
|
||||||
usage
|
usage
|
||||||
|
@ -303,10 +303,19 @@ while [ "$i" -lt "$no_shares" ]; do
|
||||||
#
|
#
|
||||||
|
|
||||||
stdecho "Transferring files..."
|
stdecho "Transferring files..."
|
||||||
rsync -a $VERBOSE $RSYNC_EXTRA $EXCLUDE \
|
|
||||||
--delete --numeric-ids --relative --delete-excluded \
|
# non parallel
|
||||||
"$source" "$destination_dir" 2>&1 $PARALLEL | add_name
|
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
|
if [ $? -ne 0 ]; then
|
||||||
errecho "rsync failed, backup may be broken (see rsync errors)"
|
errecho "rsync failed, backup may be broken (see rsync errors)"
|
||||||
continue
|
continue
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
/home/nico/tmp
|
/home/nico/bilder
|
||||||
|
|
Loading…
Reference in a new issue