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

snap-sync: reflact snapper, call convention update

Browse Source 
Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
Ralf Zerres
2017-11-24 13:52:31 +01:00
parent ae000058ac
commit 660f3734c6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/snap-sync
View File

@@ -1,4 +1,4 @@
#!/bin/sh #! /bin/sh
# snap-sync # snap-sync
# https://github.com/wesbarnett/snap-sync # https://github.com/wesbarnett/snap-sync
@@ -73,13 +73,14 @@ check_prerequisites () {
which btrfs >/dev/null 2>&1 || { printf "'btrfs' is not installed." && exit 1; } which btrfs >/dev/null 2>&1 || { printf "'btrfs' is not installed." && exit 1; }
which findmnt >/dev/null 2>&1 || { printf "'findmnt' is not installed." && exit 1; } which findmnt >/dev/null 2>&1 || { printf "'findmnt' is not installed." && exit 1; }
which systemd-cat >/dev/null 2>&1 || { printf "'systemd-cat' is not installed." && exit 1; } which systemd-cat >/dev/null 2>&1 || { printf "'systemd-cat' is not installed." && exit 1; }
which snapper >/dev/null 2>&1 || { printf "'snapper' is not installed." && exit 1; }
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=1; } which notify-send >/dev/null 2>&1 && { donotify=1; }
which pv >/dev/null 2>&1 && { do_pv_cmd=1; } which pv >/dev/null 2>&1 && { do_pv_cmd=1; }
if [ $(id -u) -ne 0 ] ; then printf "Script must be run as root" ; exit 1 ; fi if [ $(id -u) -ne 0 ] ; then printf "Script must be run as root\n" ; exit 1 ; fi
if [ ! -r "$SNAPPER_CONFIG" ]; then if [ ! -r "$SNAPPER_CONFIG" ]; then
die "$SNAPPER_CONFIG does not exist." die "$SNAPPER_CONFIG does not exist."
@@ -1157,9 +1158,8 @@ verify_snapper_structure () {
cwd=`pwd` cwd=`pwd`
ssh="" ssh=""
# this bashism and can't be ported to dash (ERR is not supported) # can't be ported to dash (ERR is not supported)
#trap 'traperror ${LINENO} $? "$BASH_COMMAND" $BASH_LINENO "${FUNCNAME[@]}"' ERR #trap 'traperror ${LINENO} $? "$BASH_COMMAND" $BASH_LINENO "${FUNCNAME[@]}"' ERR
#trap 'traperror ${LINENO} $?' ERR
trap trapkill TERM INT trap trapkill TERM INT
check_prerequisites check_prerequisites