fix running for traci homedir

[distro-setup] / conflink

diff --git a/conflink b/conflink
index ddf99010d2520f046014b349defba117b1c08331..a4a32da01c1b92c51f2da5ba3bf1d22fa843965b 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -11,6 +11,7 @@ sysv() {
 
 
 shopt -s nullglob
+shopt -s extglob
 
 # 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
@@ -20,9 +21,9 @@ subdir-link-r() {
     local root="$1"
     local targets=()
     if [[ $2 ]]; then
-        targets=( "$2"/* )
+        targets=( "$2"/!(.git) )
     else
-        for f in "$1"/*; do
+        for f in "$1"/!(.git); do
             [[ -d $f ]] && targets+=("$f") ||:
         done
     fi
@@ -31,14 +32,7 @@ subdir-link-r() {
         local fullpath="$(readlink -f "$path")"
         #e $fullpath $below # debug
         if [[ -f $path || $(dirname $(readlink -f "$fullpath")) == "$below" ]]; then
-            if [[ $dir == /p/* ]]; then
-                homes=(/home/ian)
-            else
-                homes=(/home/*)
-            fi
-            for user in ${homes[@]}; do
-                sysv lnf -T "$path" "$user/${path#$root/}"
-            done
+            sysv lnf -T "$path" "$HOME/${path#$root/}"
         elif [[ -d "$path" ]]; then
             subdir-link-r "$root" "$path"
         fi
@@ -53,12 +47,26 @@ common-file-setup() {
     (( ${#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 $1/filesystem ]]; then
+    if [[ -e $1/filesystem && $USER == ian ]]; then
         sysv s cp -R $1/filesystem/* /
     fi
 }
 
-# p needs to go first so .ssh link is created, then config link inside it
-for dir in {/a/c,/p/c}{,/machine_specific/$HOSTNAME}; do
-    common-file-setup $dir
-done
+case $USER in
+    ian)
+        # p needs to go first so .ssh link is created, then config link inside it
+        for dir in {/a/c,/p/c}{,/machine_specific/$HOSTNAME}; do
+            common-file-setup $dir
+        done
+        sudo -u traci "$BASH_SOURCE"
+        ;;
+    traci)
+        for dir in /a/c{,/machine_specific/$HOSTNAME}; do
+            common-file-setup $dir
+        done
+        ;;
+    *)
+        echo "$0: error: run as ian or traci"
+        exit 1
+        ;;
+esac