X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=conflink;h=f62de8b454c20da5f6867abb02e347c7dd80688c;hp=eb94ebe1a9ed1de38ddd8d541f84751e56d81854;hb=7c40848349654f32903ce11d14337b01e740ff89;hpb=8599d1cafb7ca273609f07f42d8d3617bf7b7398

diff --git a/conflink b/conflink
index eb94ebe..f62de8b 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.
@@ -111,9 +112,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"
     ;;
-  traci)
+  user2)
     m common-file-setup ${c_dirs[@]}
     ;;
   *)