X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=install-my-scripts;h=0e36a4f86ec8f91db051b49f9c34cc115fc50a37;hb=8452f3f3e0b837ba4e616e062787d726d7888b76;hp=6c7aabf2bb0a57d6a04f09102002a2d76b1c62dd;hpb=77f3e699ab79d597d22fc052ed03d25cf0ad02da;p=distro-setup diff --git a/install-my-scripts b/install-my-scripts index 6c7aabf..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 /a/bin/log-quiet/log-once switch-mail-host btrbk-run 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