X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=conflink;h=30d868e4dae606d244bc2decb19126fda8d70799;hp=bb5d480d4ee04d7c235ba25fd7dff78dfa70374e;hb=7e4f3d0a6130b69b7f76a3ff13e510ffbeb1484b;hpb=343a048be4b32d18540c6531048d2b9a006774ae

diff --git a/conflink b/conflink
index bb5d480..30d868e 100755
--- a/conflink
+++ b/conflink
@@ -1,14 +1,32 @@
 #!/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
+  lnf() { ln -sf "$@"; }
+fi
 
 shopt -s nullglob
 shopt -s extglob
@@ -64,7 +82,7 @@ common-file-setup() {
 }
 
 user=$(id -un)
-all_dirs=({/a/c,/p/c}{,/machine_specific/$HOSTNAME})
+all_dirs=({/a/bin/ds,/p/c}{,/machine_specific/$HOSTNAME})
 # note, we assume a group of hosts does not have the
 # same name as a single host, which is no problem on our scale.
 for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
@@ -113,7 +131,9 @@ case $user in
 
     ##### end special extra stuff #####
 
-    sudo bash -c 'shopt -s nullglob; cd /etc/openvpn; for f in client/* server/*; do ln -sf $f .; done'
+    if [[ -e /etc/openvpn ]]; then
+      sudo bash -c 'shopt -s nullglob && cd /etc/openvpn && for f in client/* server/*; do ln -sf $f .; done'
+    fi
 
     m sudo -H -u user2 "${BASH_SOURCE[0]}"
     ;;
@@ -124,3 +144,5 @@ case $user in
     echo "$0: error: unexpected user"; exit 1
     ;;
 esac
+
+echo 0 >~/.local/conflink