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

diff --git a/conflink b/conflink
index 5f38a59..bb5d480 100755
--- a/conflink
+++ b/conflink
@@ -26,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/}"
@@ -44,7 +46,7 @@ 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
@@ -77,7 +79,7 @@ case $user in
            /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
@@ -113,7 +115,7 @@ 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 user2 "$BASH_SOURCE"
+    m sudo -H -u user2 "${BASH_SOURCE[0]}"
     ;;
   user2)
     m common-file-setup ${c_dirs[@]}