X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=mount-latest-remote;h=2b5ca59fd81bfdf4efbf27385e22e86bfca3b3c5;hp=c80c00347a55033e01fdd977f5d778294b767c38;hb=HEAD;hpb=51c8b40fd2aac71d29dc9298ca65425725ad1edd

diff --git a/mount-latest-remote b/mount-latest-remote
index c80c003..f63a6f7 100755
--- a/mount-latest-remote
+++ b/mount-latest-remote
@@ -1,5 +1,12 @@
 #!/bin/bash
-# Copyright (C) 2016 Ian Kelling
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
+
+# Copyright 2024 Ian Kelling
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +21,13 @@
 # limitations under the License.
 
 
+
 # usage: HOST [mount-latest-subvol args]
 
-source /usr/local/lib/bash-bear
+set -e; . /usr/local/lib/bash-bear; set +e
 
-script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
+this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"
+readonly this_file script_dir="${this_file%/*}"
 
 if (( ! $# )); then
   echo "mount-latest-remote: error: a host argument"
@@ -49,7 +58,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/bash-bear "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 "$@"