conflink bug fix, btrbk on x3

[distro-setup] / conflink

diff --git a/conflink b/conflink
index 0dffc229e80b1b662c75fc8a0a6098008efebb88..fdd3bd6072e07c25d802e132f0a828abb9605230 100755 (executable)
--- 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
@@ -133,6 +140,13 @@ case $user in
     fi
 
     m sudo -H -u user2 "${BASH_SOURCE[0]}"
+
+    f=/a/bin/distro-setup/system-status
+    if [[ -x $f ]]; then
+      $f _
+    fi
+    echo 0 >~/.local/conflink
+
     ;;
   user2)
     m common-file-setup ${c_dirs[@]}
@@ -141,3 +155,4 @@ case $user in
     echo "$0: error: unexpected user"; exit 1
     ;;
 esac
+