minor bug fix

[distro-setup] / install-my-scripts

diff --git a/install-my-scripts b/install-my-scripts
index 6c7aabf2bb0a57d6a04f09102002a2d76b1c62dd..63084ee0cc0bb618547ed8ba5f2c0d201932c9ba 100755 (executable)
--- a/install-my-scripts
+++ b/install-my-scripts
@@ -23,12 +23,17 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
+[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
-x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
+x="$(readlink -f -- "${BASH_SOURCE[0]}")"; cd ${x%/*} # directory of this file
 
 
-e() { echo "$*"; "$@"; }
-
-# scripts that would interfere with unmounting /a, put them elsewhere
-e install /a/bin/log-quiet/log-once switch-mail-host btrbk-run mount-latest-subvol check-subvol-stale /usr/local/bin
+# scripts that would interfere with unmounting /a, put them elsewhere.
+# note: previously used the install command, but it had this habit of
+# like, once a month or so the files would be "not found" by a script
+# trying to use them, within a few minute of the last time this
+# ran. Very strange, dunno why, but rsync won't do anything unless these
+# changed, so that should fix it.
+rsync -t --chmod=755 --chown=root:root /a/bin/log-quiet/log-once switch-mail-host btrbk-run mount-latest-subvol \
+        check-subvol-stale /usr/local/bin
+rsync -t --chmod=755 --chown=root:root /a/bin/errhandle/err /usr/local/lib