various fixes and improvements

[distro-setup] / btrbk-run

diff --git a/btrbk-run b/btrbk-run
index 10bd6382c65df24a4ec1efe35a45270e70ad9005..60f065d62e568732cff437d501a1f108d2792f2f 100644 (file)
--- a/btrbk-run
+++ b/btrbk-run
@@ -45,7 +45,8 @@ rsync-dirs() {
 pre="${0##*/}: "
 m() { if $verbose; then printf "$pre%s\n"  "$*"; fi;  "$@"; }
 e() { printf "$pre%s\n"  "$*"; }
-die() { printf "$pre%s\n" "$*" >&2;  exit 1; }
+die() { printf "$pre%s\n" "$*" >&2; echo "exiting with status 1" >&2; exit 1; }
+mexit() { echo "exiting with status $1"; exit $1; }
 
 # latest $MAIL_HOST
 if [[ -e /b/bash_unpublished/source-state ]]; then
@@ -129,6 +130,7 @@ if $verbose; then
 fi
 ### end options parsing
 
+
 # TODO: i wonder if there should be an option to send to the default
 # targets, plus any given on the command line.
 
@@ -136,7 +138,7 @@ fi
 if [[ ! -v targets && ! $source ]]; then
   if [[ $HOSTNAME != "$MAIL_HOST" ]] && $cron ; then
     echo "MAIL_HOST=$MAIL_HOST, nothing to do"
-    exit 0
+    mexit 0
   fi
 
   at_work=false
@@ -242,7 +244,7 @@ echo "mountpoints: ${mountpoints[*]}"
 if [[ $source ]]; then
   if [[ $(ssh $source systemctl is-active btrbk.service) != inactive ]]; then
     echo "$0: error: cron btrbk is running on source. exiting out of caution"
-    exit 1
+    mexit 1
   fi
 fi
 
@@ -262,7 +264,7 @@ if ! $pull_reexec && [[ $source ]] && $pulla ; then
     e "found newer version on host $source. reexecing"
     install -T $tmpf /usr/local/bin/btrbk-run
     m /usr/local/bin/btrbk-run --pull-reexec "${orig_args[@]}"
-    exit
+    mexit 0
   fi
 fi
 
@@ -399,14 +401,14 @@ done
 
 
 if $conf_only; then
-  exit
+  mexit 0
 fi
 
 
 
 if $dry_run; then
   m btrbk -v -n $cmd_arg
-  exit 0
+  mexit 0
 elif [[ $cmd_arg == archive ]]; then
   if [[ $source ]]; then
     m btrbk $verbose_arg $progress_arg $cmd_arg ssh://$source$vol $vol
@@ -415,7 +417,7 @@ elif [[ $cmd_arg == archive ]]; then
       m btrbk $verbose_arg $progress_arg $cmd_arg $vol ssh://$tg$vol
     done
   fi
-  exit 0
+  mexit 0
 fi
 # -q and just using the syslog option seemed nice,
 # but it doesn't show when a send has a parent and when it doesn't.
@@ -443,7 +445,8 @@ else
   m /a/exe/mount-latest-remote ${targets[@]}
 fi
 
-exit $ret
+e btrbk-run COMPLETED with exit status $ret
+mexit $ret
 
 # todo: move variable data we don't care about backing up
 # to /nocow and symlink it.