From d53b37dd969ceacc8c57dd4b597799717b52bd1d Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Sun, 17 Jul 2016 16:50:31 -0700
Subject: [PATCH] various fixes
---
conflink | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/conflink b/conflink
index 32459f4..d348078 100755
--- a/conflink
+++ b/conflink
@@ -11,11 +11,6 @@ sysv() {
#
-if [[ -e /root/.unison && ! -L /root/.unison ]]; then
- d=/q/p/c/machine_specific/$host/.unison
- mkdir -p $d
- mv -f /root/.unison/* $d
-fi
shopt -s nullglob
@@ -48,24 +43,18 @@ subdir-link-r() {
}
common-file-setup() {
+ local dir fs_files x
for dir in "$@"; do
+ fs_files=( $dir/filesystem/* )
+ if [[ -e ${fs_files[0]} && $USER == ian ]]; then
+ sysv s cp -R ${fs_files[@]} /
+ fi
if [[ -e $dir/subdir_files ]]; then
subdir-link-r $dir/subdir_files
fi
- local x=( $dir/!(subdir_files|filesystem) )
- (( ${#x[@]} >= 1 )) || return 0
+ local x=( $dir/!(subdir_files|filesystem|machine_specific) )
+ (( ${#x[@]} >= 1 )) || continue
sysv lnf ${x[@]} ~
- # as of this writing, it doesn't exist in /a/c, but I've used it in the past.
- if [[ -e $dir/filesystem && $USER == ian ]]; then
- sysv s cp -R $dir/filesystem/* /
- fi
- done
-}
-
-link-dirs() {
- for dir in "$@"; do
- common-file-setup $dir
- common-file-setup $dir/machine_specific/$HOSTNAME
done
}
@@ -74,7 +63,7 @@ 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 $dir ${all_dirs[@]}
+ common-file-setup ${all_dirs[@]}
sudo -u traci "$BASH_SOURCE"
;;
traci)
--
2.30.2