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

snap-sync: improve flag handling (parse_params)

Browse Source 
- donotify
- do_pv_cmd

Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
Ralf Zerres
2018-01-17 18:17:58 +01:00
parent 6f05af8620
commit 36964526f8
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bin/snap-sync
View File

@@ -48,7 +48,7 @@ BTRFS_PIPE=$TMPDIR_PIPE/btrfs.out
exec 3>$PIPE 4>$BTRFS_PIPE exec 3>$PIPE 4>$BTRFS_PIPE
# global variables # global variables
donotify=no donotify=false
answer=no answer=no
disk_count=-1 disk_count=-1
disk_uuid_match_count=0 disk_uuid_match_count=0
@@ -77,8 +77,8 @@ check_prerequisites () {
which wc >/dev/null 2>&1 || { printf "'wc' is not installed." && exit 1; } which wc >/dev/null 2>&1 || { printf "'wc' is not installed." && exit 1; }
# optional binaries: # optional binaries:
which notify-send >/dev/null 2>&1 && { donotify=yes; } which notify-send >/dev/null 2>&1 && { donotify=true; }
which pv >/dev/null 2>&1 && { do_pv_cmd=1; } which pv >/dev/null 2>&1 && { do_pv_cmd=true; }
if [ $(id -u) -ne 0 ] ; then printf "Script must be run as root\n" ; exit 1 ; fi if [ $(id -u) -ne 0 ] ; then printf "Script must be run as root\n" ; exit 1 ; fi
@@ -234,7 +234,7 @@ get_config(){
notify () { notify () {
# estimation: batch calls should just log # estimation: batch calls should just log
if [ "$donotify" = "yes" ]; then if [ "$donotify" = "true" ]; then
for u in $(users | sed 's/ /\n/' | sort -u); do for u in $(users | sed 's/ /\n/' | sort -u); do
sudo -u $u DISPLAY=:0 \ sudo -u $u DISPLAY=:0 \
DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(sudo -u $u id -u)/bus \ DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(sudo -u $u id -u)/bus \
@@ -310,12 +310,13 @@ parse_params () {
;; ;;
-i|--interactive) -i|--interactive)
interactive=1 interactive=1
donotify=yes donotify=true
shift shift
;; ;;
-n|--noconfirm|--batch) -n|--noconfirm|--batch)
batch=1 batch=1
donotify=no do_pv_cmd=false
donotify=false
shift shift
;; ;;
--remote) --remote)
@@ -458,7 +459,7 @@ parse_params () {
if [ "$verbose" ]; then snap_sync_options="verbose=true"; fi if [ "$verbose" ]; then snap_sync_options="verbose=true"; fi
if [ "$dryrun" ]; then snap_sync_options="${snap_sync_options} dry-run=true"; fi if [ "$dryrun" ]; then snap_sync_options="${snap_sync_options} dry-run=true"; fi
if [ "$batch" ]; then snap_sync_options="${snap_sync_options} batch=true"; fi if [ "$batch" ]; then snap_sync_options="${snap_sync_options} batch=true do_pv_cmd=false" ; fi
if [ "$interactive" ]; then snap_sync_options="${snap_sync_options} interactive=true batch=false"; fi if [ "$interactive" ]; then snap_sync_options="${snap_sync_options} interactive=true batch=false"; fi
printf "Options: '%s'\n" "${snap_sync_options}" printf "Options: '%s'\n" "${snap_sync_options}"
fi fi
@@ -691,7 +692,7 @@ run_backup () {
snapper_target_snapshot_size=$(du --sum $snapper_new_snapshot 2>/dev/null | awk -F ' ' '{print $1}') snapper_target_snapshot_size=$(du --sum $snapper_new_snapshot 2>/dev/null | awk -F ' ' '{print $1}')
# settings for interactive progress status # settings for interactive progress status
if [ $do_pv_cmd ]; then if [ "$do_pv_cmd" == "true" ]; then
pv_options="--delay-start 2 --interval 5 --timer --rate --bytes --fineta --progress" pv_options="--delay-start 2 --interval 5 --timer --rate --bytes --fineta --progress"
cmd_pv="pv $pv_options --size $snapper_target_snapshot_size |" cmd_pv="pv $pv_options --size $snapper_target_snapshot_size |"
#cmd_pv="pv $pv_options --size $snapper_target_snapshot_size | dialog --gauge \"$progname: Progress for config '$selected_config'\" 6 85 |" #cmd_pv="pv $pv_options --size $snapper_target_snapshot_size | dialog --gauge \"$progname: Progress for config '$selected_config'\" 6 85 |"