forked from ungleich-public/ccollect
Some more preperations for parallel backuping
This commit is contained in:
parent
bc076c7760
commit
f997286074
2 changed files with 8 additions and 5 deletions
12
ccollect.sh
12
ccollect.sh
|
@ -180,7 +180,7 @@ while [ "$i" -lt "$no_shares" ]; do
|
||||||
c_verbose="$backup/verbose"
|
c_verbose="$backup/verbose"
|
||||||
c_rsync_extra="$backup/rsync_options"
|
c_rsync_extra="$backup/rsync_options"
|
||||||
|
|
||||||
stdecho "Beginning to backup \"$name\" ..."
|
stdecho "Beginning to backup this source ..."
|
||||||
i=$[$i+1]
|
i=$[$i+1]
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -285,9 +285,10 @@ while [ "$i" -lt "$no_shares" ]; do
|
||||||
|
|
||||||
# only copy if a directory exists
|
# only copy if a directory exists
|
||||||
if [ "$last_dir" ]; then
|
if [ "$last_dir" ]; then
|
||||||
cp "$VERBOSE" -al "$last_dir" "$destination_dir" 2>&1 | add_name
|
echo cp "$VERBOSE" -al "$last_dir" "$destination_dir" 2>&1 | add_name
|
||||||
else
|
else
|
||||||
mkdir "$destination_dir" 2>&1 | add_name
|
stdecho "Creating $destination_di"
|
||||||
|
echo mkdir "$destination_dir" 2>&1 | add_name
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
|
@ -300,8 +301,8 @@ while [ "$i" -lt "$no_shares" ]; do
|
||||||
# options stolen shameless from rsnapshot
|
# options stolen shameless from rsnapshot
|
||||||
#
|
#
|
||||||
|
|
||||||
rsync -a "$VERBOSE" --delete --numeric-ids --relative --delete-excluded \
|
echo rsync -a "$VERBOSE" --delete --numeric-ids --relative --delete-excluded \
|
||||||
"$EXCLUDE" "$RSYNC_EXTRA" "$source" "$destination_dir" 2>&1 | \
|
"$EXCLUDE" "$RSYNC_EXTRA" "$source" "$destination_dir" 2>&1 $PARALLEL | \
|
||||||
add_name
|
add_name
|
||||||
|
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
|
@ -316,6 +317,7 @@ done
|
||||||
# Be a good parent and wait for our children, if they are running wild parallel
|
# Be a good parent and wait for our children, if they are running wild parallel
|
||||||
#
|
#
|
||||||
if [ "$PARALLEL" ]; then
|
if [ "$PARALLEL" ]; then
|
||||||
|
echo "Waiting for rsync jobs to complete..."
|
||||||
wait
|
wait
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -3,3 +3,4 @@
|
||||||
* Updated and made documentation readable
|
* Updated and made documentation readable
|
||||||
* implemented verbose option
|
* implemented verbose option
|
||||||
* Fixed double exclude parameter bug
|
* Fixed double exclude parameter bug
|
||||||
|
* Added much better documentation (asciidoc)
|
||||||
|
|
Loading…
Reference in a new issue