zawz/shtools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

zsync: add failsafe measures

Browse source
This commit is contained in:
zawz 2020-08-04 12:29:15 +02:00
parent 1200344e51
commit 0929ce279e
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
zsync/zsync
View file

@ -102,11 +102,12 @@ get_deleted()
} }
# init # init
init_local(){ init_local() {
mkdir -p "$syncdir" || exit $? # create syncdir mkdir -p "$syncdir" || exit $? # create syncdir
} }
init_server() { init_server() {
ssh $raddr "mkdir -p '$rdir/$syncdir'" ssh $raddr "mkdir -p '$rdir/$syncdir'" || return $?
ssh $raddr "which rsync >/dev/null 2>&1" || { echo "rsync not found on server" >&2 && return 1; }
} }
# read file list from stdin # read file list from stdin
@ -118,7 +119,7 @@ send() {
sed 's|\./||g' sed 's|\./||g'
else else
printf '* ' printf '* '
rsync $rsync_opts --files-from=- --exclude=".zsync" -e ssh "$(pwd)" "$raddr:$rdir" rsync $rsync_opts --files-from=- --exclude=".zsync" -e ssh "$(pwd)" "$raddr:$rdir" || return $?
fi fi
} }
@ -130,7 +131,7 @@ recieve() {
sed 's|\./||g' sed 's|\./||g'
else else
printf '* ' printf '* '
rsync $rsync_opts --files-from=- -e ssh "$raddr:$rdir" "$(pwd)" rsync $rsync_opts --files-from=- -e ssh "$raddr:$rdir" "$(pwd)" || return $?
fi fi
} }
@ -144,11 +145,13 @@ delete_server() {
else else
echo "* sending deleted" echo "* sending deleted"
ssh $raddr "cd '$rdir' || exit 1 ssh $raddr "cd '$rdir' || exit 1
trashutil='gio trash'
which trash-put >/dev/null 2>&1 && trashutil=trash-put
while read -r ln while read -r ln
do do
gio trash \"\$ln\" && echo \"\$ln\" \$trashutil \"\$ln\" && echo \"\$ln\" || exit \$?
done done
" " || return $?
fi fi
} }
# read delete from stdin # read delete from stdin
@ -159,9 +162,11 @@ delete_local() {
sed 's|\./||g' sed 's|\./||g'
else else
echo "* recieving deleted" echo "* recieving deleted"
trashutil='gio trash'
which trash-put >/dev/null 2>&1 && trashutil=trash-put
while read -r ln while read -r ln
do do
gio trash "$ln" && echo "$ln" $trashutil "$ln" && echo "$ln" || return $?
done done
fi fi
} }
@ -181,14 +186,14 @@ setup_server()
forcepull() forcepull()
{ {
rsync $rsync_opts -r --delete -e ssh "$raddr:$rdir" "$(pwd)/." rsync $rsync_opts -r --delete -e ssh "$raddr:$rdir" "$(pwd)/." || return $?
sleep 1 sleep 1
set_timestamp_local set_timestamp_local
} }
forcepush() forcepush()
{ {
rsync $rsync_opts -r --delete -e ssh "$(pwd)/." "$raddr:$rdir" rsync $rsync_opts -r --delete -e ssh "$(pwd)/." "$raddr:$rdir" || return $?
sleep 1 sleep 1
set_timestamp_local set_timestamp_local
} }