iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve conflink outdated detection
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index 30d868e4dae606d244bc2decb19126fda8d70799..42c811a6437f16b9e195b1fded71eb3516826efe 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-24,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
@@
-145,4
+149,8
@@
case $user in
;;
esac
;;
esac
+f=/a/bin/distro-setup/system-status
+if [[ -x $f ]]; then
+ $f _
+fi
echo 0 >~/.local/conflink
echo 0 >~/.local/conflink