various fixes

[distro-setup] / btrbk-run

diff --git a/btrbk-run b/btrbk-run
index 32a0c1d25a176b487d7ec5a13e19f92e01b1783a..9ca4eb3333eaffbaa8b176a71d73d240c5530d6b 100755 (executable)
--- a/btrbk-run
+++ b/btrbk-run
@@ -6,21 +6,14 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
 
 conf_only=false
-if [[ $1 == -c ]]; then
-    # mostly for testing
-    conf_only=true
-fi
-
-target_host=frodo
-cat >/etc/btrbk.conf <<'EOF'
-ssh_identity /root/.ssh/id_rsa
-transaction_syslog daemon
-
-# so we only run one at a time
-lockfile                   /var/lock/btrbk.lock
+dry_run=false
+# mostly for testing
+case $1 in
+    -c) conf_only=true ;;
+    -n) dry_run=true ;;
+    ?*) echo "$0: error: unsupported arg"; exit 1 ;;
+esac
 
-# default format of short does not accomidate hourly preservation setting
-timestamp_format long-iso
 # background on timezones. with short/long, timestamps use local time.
 # for long, if your local time moves backwards, by moving timezones or
 # for an hour when daylight savings changes it, you will temporarily get
@@ -36,6 +29,17 @@ timestamp_format long-iso
 # I don't see any problem with shifting when the day starts for
 # retention, so I'm using long-iso.
 
+target_host=frodo
+cat >/etc/btrbk.conf <<'EOF'
+ssh_identity /root/.ssh/id_rsa
+transaction_syslog daemon
+
+# so we only run one at a time
+lockfile                   /var/lock/btrbk.lock
+
+# default format of short does not accomidate hourly preservation setting
+timestamp_format long-iso
+
 # only make a snapshot if things have changed
 snapshot_create onchange
 # much less snapshots because I have less space on the
@@ -85,4 +89,8 @@ if $conf_only; then
     exit
 fi
 
-btrbk -q run
+if $dry_run; then
+    btrbk -n run
+else
+    btrbk -q run
+fi