X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=0dffc229e80b1b662c75fc8a0a6098008efebb88;hb=6f1f8a104c9b38936ade2d27e835479523985133;hp=f62de8b454c20da5f6867abb02e347c7dd80688c;hpb=7c40848349654f32903ce11d14337b01e740ff89;p=distro-setup

diff --git a/conflink b/conflink
index f62de8b..0dffc22 100755
--- a/conflink
+++ b/conflink
@@ -2,13 +2,28 @@
 
 source /a/bin/errhandle/err
 
+
+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
@@ -26,12 +41,14 @@ subdir-link-r() {
     targets=( "$2"/!(.git|..|.) )
   else
     for f in "$1"/!(.git|..|.); do
-      [[ -d $f ]] && targets+=("$f") ||:
+      if [[ -d $f ]]; then targets+=("$f"); fi
     done
   fi
-  local below="$( readlink -f "$root/..")"
+  local below
+  below="$( readlink -f "$root/..")"
   for path in "${targets[@]}"; do
-    local fullpath="$(readlink -f "$path")"
+    local fullpath
+    fullpath="$(readlink -f "$path")"
     #e $fullpath $below # debug
     if [[ -f $path || $(dirname $(readlink -f "$fullpath")) == "$below" ]]; then
       m lnf -T "$path" "$HOME/${path#$root/}"
@@ -44,10 +61,10 @@ subdir-link-r() {
 
 
 common-file-setup() {
-  local dir fs x bdir f dst
+  local dir fs x f
   for dir in "$@"; do
     fs=$dir/filesystem
-    if [[ -e $fs && $USER =~ ^iank?$ ]]; then
+    if [[ -e $fs && $user =~ ^iank?$ ]]; then
       # note, symlinks get resolved, not copied.
       s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
     fi
@@ -61,7 +78,8 @@ common-file-setup() {
   done
 }
 
-all_dirs=({/a/c,/p/c}{,/machine_specific/$HOSTNAME})
+user=$(id -un)
+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
@@ -69,14 +87,14 @@ for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
 done
 
 c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
-case $USER in
+case $user in
   iank)
     files=(/p/c/machine_specific/*/filesystem/etc/ssh/*_key
            /p/c/filesystem/etc/openvpn/client/*.key
            /p/c/filesystem/etc/openvpn/easy-rsa/keys/*.key
            /p/c/machine_specific/kw/filesystem/etc/openvpn/client/*.key
           )
-    if [[ -e $files ]]; then
+    if [[ -e ${files[0]} ]]; then
       chmod 600 ${files[@]}
     fi
     # p needs to go first so .ssh link is created, then config link inside it
@@ -110,9 +128,11 @@ 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"
+    m sudo -H -u user2 "${BASH_SOURCE[0]}"
     ;;
   user2)
     m common-file-setup ${c_dirs[@]}