X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=mount-latest-remote;h=3da3abf5fa3df9ee158c8faf9c7715d74032d3ec;hb=d67edcdca8795a4bca116aa532d02dda246a6f53;hp=bcd9e284e1703c3c686860ae2cae3d3a5cd5760f;hpb=c00afb64faf2a6f25c59a72c0e801f079ea746aa;p=distro-setup

diff --git a/mount-latest-remote b/mount-latest-remote
index bcd9e28..3da3abf 100755
--- a/mount-latest-remote
+++ b/mount-latest-remote
@@ -16,9 +16,10 @@
 
 # usage: HOST [mount-latest-subvol args]
 
-source /usr/local/lib/err
+set -e; . /usr/local/lib/bash-bear; set +e
 
-script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
+readonly this_file; this_file="$(readlink -f -- "${BASH_SOURCE[0]}")";
+script_dir=${this_file%/*}
 
 if (( ! $# )); then
   echo "mount-latest-remote: error: a host argument"
@@ -49,7 +50,7 @@ if [[ $tg == *:* ]]; then
   rsynctg="[$tg]"
 fi
 # R = relative, t = times, O = omit-dir-times, p = perms
-er rsync -RtOp bin/{mount-latest-subvol,check-subvol-stale} lib/err "root@$rsynctg:/usr/local" || continue
+er rsync -RtOp bin/{mount-latest-subvol,check-subvol-stale} lib/bash-bear "root@$rsynctg:/usr/local" ||:
 # note: this can hang if we have an old nfs mount.
 er ssh root@$tg timeout -s 9 600 /usr/local/bin/mount-latest-subvol "$@"