X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=install-my-scripts;h=0e36a4f86ec8f91db051b49f9c34cc115fc50a37;hb=343a048be4b32d18540c6531048d2b9a006774ae;hp=278a3b051b058dea8ba6a6d50ff25eff857c9f47;hpb=eb9b839bb5a91c60cc4f6eb9d7e38ffbf73f0e90;p=distro-setup

diff --git a/install-my-scripts b/install-my-scripts
index 278a3b0..0e36a4f 100755
--- a/install-my-scripts
+++ b/install-my-scripts
@@ -23,12 +23,12 @@
 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 guest-apt mount-latest-subvol check-subvol-stale /usr/local/bin
+install /a/bin/log-quiet/log-once switch-mail-host btrbk-run mount-latest-subvol \
+        check-subvol-stale /usr/local/bin
+install /a/bin/errhandle/err /usr/local/lib