rzerres/dsnap-sync
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

dsnap-sync: code cleanup

Browse Source 
* get_sanpper_sync_id() (arg: snapper_config, remote)

Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
Ralf Zerres
2018-09-12 10:49:52 +02:00
parent a13ed29285
commit c426ca5f6d
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bin/dsnap-sync
View File

@@ -738,8 +738,7 @@ get_snapper_last_sync_id () {
get_snapper_sync_id () { get_snapper_sync_id () {
local snapper_config=${1#snapper_config=} local snapper_config=${1#snapper_config=}
snapper_sync_id=${2##snapper_sync_id=} local remote=${2##remote=}
local remote=${3##remote=}
local run_ssh='' local run_ssh=''
local ret= local ret=
@@ -759,7 +758,7 @@ get_snapper_sync_id () {
[ ${#remote} -gt 0 ] && run_ssh=$ssh [ ${#remote} -gt 0 ] && run_ssh=$ssh
cmd="snapper --config "$snapper_config" list --type single \ cmd="snapper --config "$snapper_config" list --type single \
| awk -F '|' '\$1 == "$snapper_sync_id" { gsub(/ /,_); print \$1}'" | awk -F '|' ' \$1 == $snapper_sync_id { gsub(/ /,_); print \$1} '"
ret=$(eval $run_ssh "$cmd") ret=$(eval $run_ssh "$cmd")
if [ ${#ret} -ge 1 ]; then if [ ${#ret} -ge 1 ]; then
@@ -1230,7 +1229,7 @@ run_config_preparation () {
if [ $snapper_target_sync_id -ne $snapper_source_sync_id ]; then if [ $snapper_target_sync_id -ne $snapper_source_sync_id ]; then
# select commen sync id # select commen sync id
get_snapper_sync_id "snapper_config=${selected_config}" "snapper_sync_id=$snapper_target_sync_id" "remote=" get_snapper_sync_id "snapper_config=${selected_config}" "remote="
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
snapper_common_sync_snapshot=$SUBVOLUME/.snapshots/$snapper_sync_id/snapshot snapper_common_sync_snapshot=$SUBVOLUME/.snapshots/$snapper_sync_id/snapshot
snapper_common_sync_id=$snapper_sync_id snapper_common_sync_id=$snapper_sync_id
@@ -1770,10 +1769,6 @@ run_finalize () {
printf "calling: '%s'\n" "$cmd" printf "calling: '%s'\n" "$cmd"
fi fi
ret=$(eval "$cmd") ret=$(eval "$cmd")
#ret=$ssh snapper --config \"$snapper_target_config\" list --type single \
# | awk ' /'\"$snap_description_running\"'/ ' \
# | awk -F '|' ' $1 == "$snapper_target_sync_id" {print $1} '
#printf "return: '%s'\n" "$?"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
if [ $ret -eq $snapper_target_id ]; then if [ $ret -eq $snapper_target_id ]; then
# got snapshot as $snapper_target_id # got snapshot as $snapper_target_id
@@ -1801,7 +1796,6 @@ run_finalize () {
--userdata "host=$src_host, subvolid=$src_subvolid, uuid=$src_uuid" \ --userdata "host=$src_host, subvolid=$src_subvolid, uuid=$src_uuid" \
--cleanup-algorithm "timeline" \ --cleanup-algorithm "timeline" \
$snapper_target_id) $snapper_target_id)
fi fi
if [ $verbose -ge 3 ]; then if [ $verbose -ge 3 ]; then
printf "return: '%s'\n" "$ret" printf "return: '%s'\n" "$ret"
@@ -1832,8 +1826,8 @@ run_finalize () {
if [ $verbose -ge 3 ]; then if [ $verbose -ge 3 ]; then
printf "${MAGENTA}Tagging snapper metadata${NO_COLOR} for snapper id ${GREEN}'%s'${NO_COLOR} on source for configuration ${GREEN}'%s'${NO_COLOR} ...\n" \ printf "${MAGENTA}Tagging snapper metadata${NO_COLOR} for snapper id ${GREEN}'%s'${NO_COLOR} on source for configuration ${GREEN}'%s'${NO_COLOR} ...\n" \
"$snapper_source_id" "$selected_config" "$snapper_source_id" "$selected_config"
# printf "calling: '%s'\n" "$($cmd)" #printf "calling: '%s'\n" "$(eval $cmd)"
printf "calling: '%s'\n" "$(eval $cmd)" printf "calling: '%s'\n" "$cmd"
fi fi
ret=$(eval "$cmd") ret=$(eval "$cmd")
if [ $verbose -ge 3 ]; then if [ $verbose -ge 3 ]; then