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

diff --git a/conflink b/conflink
index eb94ebe..bb5d480 100755
--- a/conflink
+++ b/conflink
@@ -11,7 +11,8 @@ lnf() { /a/exe/lnf "$@"; }
 
 
 shopt -s nullglob
-shopt -s extglob # note, already set with bash -l
+shopt -s extglob
+shopt -s dotglob
 
 # 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.
@@ -25,12 +26,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/}"
@@ -43,10 +46,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
@@ -60,6 +63,7 @@ common-file-setup() {
   done
 }
 
+user=$(id -un)
 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.
@@ -68,14 +72,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
@@ -111,9 +115,9 @@ case $USER in
 
     sudo bash -c 'shopt -s nullglob; cd /etc/openvpn; for f in client/* server/*; do ln -sf $f .; done'
 
-    m sudo -H -u traci "$BASH_SOURCE"
+    m sudo -H -u user2 "${BASH_SOURCE[0]}"
     ;;
-  traci)
+  user2)
     m common-file-setup ${c_dirs[@]}
     ;;
   *)