iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mostly mail and monitoring fixes
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index 0dffc229e80b1b662c75fc8a0a6098008efebb88..a763c22a03eb2d29db832a3eed473d322d4e9b11 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-1,6
+1,9
@@
#!/bin/bash
source /a/bin/errhandle/err
#!/bin/bash
source /a/bin/errhandle/err
+_errcatch_cleanup() {
+ echo 1 >~/.local/conflink
+}
usage() {
usage() {
@@
-21,8
+24,12
@@
m() {
s() { sudo "$@"; }
lnf() { /a/exe/lnf "$@"; }
s() { sudo "$@"; }
lnf() { /a/exe/lnf "$@"; }
-if [[ $1 == -f ]]; then
+if [[ $1 == -f ]]; then
# f for fast
lnf() { ln -sf "$@"; }
lnf() { ln -sf "$@"; }
+elif
+ [[ $1 ]]; then
+ echo "error: unrecognized arguments" >&2
+ exit 0
fi
shopt -s nullglob
fi
shopt -s nullglob
@@
-141,3
+148,5
@@
case $user in
echo "$0: error: unexpected user"; exit 1
;;
esac
echo "$0: error: unexpected user"; exit 1
;;
esac
+
+echo 0 >~/.local/conflink