Move independent repo myunison into this repo

[distro-setup] / conflink

diff --git a/conflink b/conflink
index 32459f4f2853f866d2723b3b949022f55400c9c0..8431c168a40a5a36e13d7a2fd17ba80f39f1dbf5 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -1,37 +1,33 @@
-#!/bin/bash -l
+#!/bin/bash
 
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+source /a/bin/errhandle/errcatch-function
+source /a/bin/errhandle/bash-trace-function
 
+errcatch
 
-sysv() {
-    e "$@"
+m() {
+    echo "$*"
     "$@"
 }
-
-
-#
-if [[ -e /root/.unison && ! -L /root/.unison ]]; then
-    d=/q/p/c/machine_specific/$host/.unison
-    mkdir -p $d
-    mv -f /root/.unison/* $d
-fi
+s() { sudo "$@"; }
+lnf() { /a/exe/lnf "$@"; }
 
 
 shopt -s nullglob
-shopt -s extglob
+shopt -s extglob # note, already set with bash -l
 
-# if we make a link back to the root, traversing the subdirs stops.
-# This makes it so we can do subdir directories. Must call with absolute
-# paths.
+# If we make a link back to the root, we stop going deeper into subdir_files.
+# This makes it so we can do subdir directories.
+#
+# Also note, under filesystem/, symlinks are expanded.
 
 subdir-link-r() {
     local root="$1"
     local targets=()
     if [[ $2 ]]; then
-        targets=( "$2"/!(.git) )
+        targets=( "$2"/!(.git|..|.) )
     else
-        for f in "$1"/!(.git); do
+        for f in "$1"/!(.git|..|.); do
             [[ -d $f ]] && targets+=("$f") ||:
         done
     fi
@@ -40,7 +36,7 @@ subdir-link-r() {
         local fullpath="$(readlink -f "$path")"
         #e $fullpath $below # debug
         if [[ -f $path || $(dirname $(readlink -f "$fullpath")) == "$below" ]]; then
-            sysv lnf -T "$path" "$HOME/${path#$root/}"
+            m lnf -T "$path" "$HOME/${path#$root/}"
         elif [[ -d "$path" ]]; then
             subdir-link-r "$root" "$path"
         fi
@@ -48,33 +44,34 @@ subdir-link-r() {
 }
 
 common-file-setup() {
+    local dir fs x
     for dir in "$@"; do
+        fs=$dir/filesystem
+        if [[ -e $fs && $USER == ian ]]; then
+            # note, symlinks get resolved, not copied.
+            m s cp -RLT --preserve=mode,timestamps $fs /
+        fi
         if [[ -e $dir/subdir_files ]]; then
             subdir-link-r $dir/subdir_files
         fi
-        local x=( $dir/!(subdir_files|filesystem) )
-        (( ${#x[@]} >= 1 )) || return 0
-        sysv lnf ${x[@]} ~
-        # as of this writing, it doesn't exist in /a/c, but I've used it in the past.
-        if [[ -e $dir/filesystem && $USER == ian ]]; then
-            sysv s cp -R $dir/filesystem/* /
-        fi
-    done
-}
-
-link-dirs() {
-    for dir in "$@"; do
-        common-file-setup $dir
-        common-file-setup $dir/machine_specific/$HOSTNAME
+        local x=( $dir/!(subdir_files|filesystem|machine_specific|..|.) )
+        (( ${#x[@]} >= 1 )) || continue
+        m lnf ${x[@]} ~
     done
 }
 
 all_dirs=({/a/c,/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; do
+    if grep -qxF $HOSTNAME $x; then all_dirs+=( ${x%.hosts} ); fi
+done
+
 c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
 case $USER in
     ian)
         # p needs to go first so .ssh link is created, then config link inside it
-        common-file-setup $dir ${all_dirs[@]}
+        common-file-setup ${all_dirs[@]}
         sudo -u traci "$BASH_SOURCE"
         ;;
     traci)