X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=42c811a6437f16b9e195b1fded71eb3516826efe;hb=313bf2239f766a5a1d060133131b477478873ad7;hp=0dffc229e80b1b662c75fc8a0a6098008efebb88;hpb=6f1f8a104c9b38936ade2d27e835479523985133;p=distro-setup diff --git a/conflink b/conflink index 0dffc22..42c811a 100755 --- a/conflink +++ b/conflink @@ -1,6 +1,9 @@ #!/bin/bash source /a/bin/errhandle/err +_errcatch_cleanup() { + echo 1 >~/.local/conflink +} usage() { @@ -21,8 +24,12 @@ m() { s() { sudo "$@"; } lnf() { /a/exe/lnf "$@"; } -if [[ $1 == -f ]]; then +if [[ $1 == -f ]]; then # f for fast lnf() { ln -sf "$@"; } +elif + [[ $1 ]]; then + echo "error: unrecognized arguments" >&2 + exit 0 fi shopt -s nullglob @@ -141,3 +148,9 @@ case $user in echo "$0: error: unexpected user"; exit 1 ;; esac + +f=/a/bin/distro-setup/system-status +if [[ -x $f ]]; then + $f _ +fi +echo 0 >~/.local/conflink