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.
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/}"
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
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.
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
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[@]}
;;
*)