X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=a763c22a03eb2d29db832a3eed473d322d4e9b11;hb=f9ec6d39566c13775abd5d1709a44e5bd1c32997;hp=bbe13126750cddb64e67a636fefeacc2291021a7;hpb=6459d4698ef983f7b1540589b87013c76913393d;p=distro-setup diff --git a/conflink b/conflink index bbe1312..a763c22 100755 --- a/conflink +++ b/conflink @@ -1,14 +1,36 @@ #!/bin/bash source /a/bin/errhandle/err +_errcatch_cleanup() { + echo 1 >~/.local/conflink +} + + +usage() { + cat <&2 + exit 0 +fi shopt -s nullglob shopt -s extglob @@ -126,3 +148,5 @@ case $user in echo "$0: error: unexpected user"; exit 1 ;; esac + +echo 0 >~/.local/conflink