X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=fdd3bd6072e07c25d802e132f0a828abb9605230;hb=3f878090bcbab55fb07cca8cc840b4817c6eb7c5;hp=bbe13126750cddb64e67a636fefeacc2291021a7;hpb=6459d4698ef983f7b1540589b87013c76913393d;p=distro-setup

diff --git a/conflink b/conflink
index bbe1312..fdd3bd6 100755
--- a/conflink
+++ b/conflink
@@ -1,14 +1,36 @@
 #!/bin/bash
 
 source /a/bin/errhandle/err
+_errcatch_cleanup() {
+  echo 1 >~/.local/conflink
+}
+
+
+usage() {
+  cat <<EOF
+Usage: ${0##*/} [OPTIONS]
+Link or otherwise install configuration files.
+
+-f   For fast. Dont use lnf, use ln -sf. Good for updating existing files.
+EOF
+  exit $1
+}
+
 
 m() {
   echo "$*"
   "$@"
 }
 s() { sudo "$@"; }
-lnf() { /a/exe/lnf "$@"; }
 
+lnf() { /a/exe/lnf "$@"; }
+if [[ $1 == -f ]]; then # f for fast
+  lnf() { ln -sf "$@"; }
+elif
+  [[ $1 ]]; then
+  echo "error: unrecognized arguments" >&2
+  exit 0
+fi
 
 shopt -s nullglob
 shopt -s extglob
@@ -118,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[@]}
@@ -126,3 +155,4 @@ case $user in
     echo "$0: error: unexpected user"; exit 1
     ;;
 esac
+