robustness

[distro-setup] / conflink

diff --git a/conflink b/conflink
index f62de8b454c20da5f6867abb02e347c7dd80688c..5f38a596ab113943664db9dbc3805489704acfe6 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -47,7 +47,7 @@ common-file-setup() {
   local dir fs x bdir f dst
   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,6 +61,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.
@@ -69,7 +70,7 @@ 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