further bash 4.4 fix, make script stand alone

diff --git a/conflink b/conflink
index c385ca04e8e7c9738edaa7be5b480bb25ddef05d..8431c168a40a5a36e13d7a2fd17ba80f39f1dbf5 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -1,24 +1,25 @@
-#!/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() {
-    echo "$@"
+m() {
+    echo "$*"
     "$@"
 }
-
-
-#
+s() { sudo "$@"; }
+lnf() { /a/exe/lnf "$@"; }
 
 
 shopt -s nullglob
 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"
@@ -35,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
@@ -43,23 +44,29 @@ subdir-link-r() {
 }
 
 common-file-setup() {
-    local dir fs_files x
+    local dir fs x
     for dir in "$@"; do
-        fs_files=( $dir/filesystem/* )
-        if [[ -e ${fs_files[0]} && $USER == ian ]]; then
+        fs=$dir/filesystem
+        if [[ -e $fs && $USER == ian ]]; then
             # note, symlinks get resolved, not copied.
-            sysv s cp -RL ${fs_files[@]} /
+            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|machine_specific) )
+        local x=( $dir/!(subdir_files|filesystem|machine_specific|..|.) )
         (( ${#x[@]} >= 1 )) || continue
-        sysv lnf ${x[@]} ~
+        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)