X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=btrbk-run;h=bf5117865368a98b0fe2dfc8bd0c2396ca4a30cc;hp=c4d84616a9c3427391e9a095e65ccd14d369bcac;hb=51c8b40fd2aac71d29dc9298ca65425725ad1edd;hpb=0d347f93336619d663f1f3cdd771b92df390c494 diff --git a/btrbk-run b/btrbk-run index c4d8461..bf51178 100644 --- a/btrbk-run +++ b/btrbk-run @@ -22,7 +22,7 @@ [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@" -source /usr/local/lib/err +source /usr/local/lib/bash-bear usage() { cat <<'EOF' @@ -259,7 +259,7 @@ if ! $force && { $check_installed || [[ ! $source ]]; } ; then uninstalled-file-die $f fi done - if ! diff -q /a/bin/errhandle/err /usr/local/lib/err; then + if ! diff -q /a/bin/bash-bear-trap/bash-bear /usr/local/lib/bash-bear; then uninstalled-file-die err fi if $check_installed; then @@ -502,7 +502,7 @@ done if ! $pull_reexec && [[ $source ]] && $pulla ; then tmpf=$(mktemp) m rsync -ra $source:/usr/local/bin/{mount-latest-subvol,check-subvol-stale} /usr/local/bin - m rsync -ra $source:/usr/local/lib/err /usr/local/lib + m rsync -ra $source:/usr/local/lib/bash-bear /usr/local/lib m scp $source:/a/bin/distro-setup/btrbk-run $tmpf if ! diff -q $tmpf ${BASH_SOURCE[0]}; then e "found different version on host $source. reexecing"