lots of stuff lumped together

[distro-setup] / conflink

diff --git a/conflink b/conflink
index 1fb519d94cd5b7d04f02f83ea9d4ce876c59ec6e..7a597e3d86db0c970805531509a99b98c527fb0b 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -55,7 +55,7 @@ common-file-setup() {
         fi
 
         if [[ -e $dir/subdir_files ]]; then
-            subdir-link-r $dir/subdir_files
+            m subdir-link-r $dir/subdir_files
         fi
         local x=( $dir/!(binds|subdir_files|filesystem|machine_specific|..|.) )
         (( ${#x[@]} >= 1 )) || continue
@@ -74,19 +74,19 @@ 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 ${all_dirs[@]}
+        m common-file-setup ${all_dirs[@]}
         if [[ -d /etc/bind/bind-writable ]]; then
             # need bind writable dir for nsupdate, or else we get
             # named[20823]: /etc/bind/db.iank.pw.jnl: create: permission denied
-            s chgrp bind /etc/bind/bind-writable
+            m s chgrp bind /etc/bind/bind-writable
         fi
         if [[ -e /etc/davpass ]] && getent group www-data &>/dev/null; then
             s chgrp www-data /etc/davpass
         fi
-        sudo -u traci "$BASH_SOURCE"
+        m sudo -H -u traci "$BASH_SOURCE"
         ;;
     traci)
-        common-file-setup ${c_dirs[@]}
+        m common-file-setup ${c_dirs[@]}
         ;;
     *)
         echo "$0: error: unexpected user"; exit 1