X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=ian-dotfiles.git;a=blobdiff_plain;f=infra%2Fmakelinks;h=46c901e9b0c0a3d17a62abac41802243d6e6e231;hp=6bcf4d94ae2855e0e1636199ff04d78f9929082a;hb=54850ae619300ca6cf8c53d285205ec179c6852f;hpb=27f81142542580eb56972a991771047c732e5540

diff --git a/infra/makelinks b/infra/makelinks
index 6bcf4d9..46c901e 100755
--- a/infra/makelinks
+++ b/infra/makelinks
@@ -33,8 +33,6 @@ esac
 
 mode=$1; shift
 
-dots=$( find dot -mindepth 1 -maxdepth 1 -name '[0-9a-zA-Z]*[0-9a-zA-Z]' )
-
 basepath=$(pwd)
 basepath=${basepath#$HOME/}
 
@@ -46,13 +44,13 @@ show () {
 
 good () {
     if [ $mode = list ]; then
-	show "good: $dot: $1"
+	show "good: $prhome: $1"
     fi
 }
 
 bad () {
     estatus=16
-    show "bad: $dot: $1" >&2
+    show "bad: $prhome: $1" >&2
 }
 
 needs () {
@@ -74,44 +72,96 @@ with_log () {
     "$@"
 }
 
-for dot in $dots; do
-    underhome=".${dot#dot/}"
+process_object () {
     inhome="$HOME/$underhome"
     prhome="~/$underhome"
-    if [ "$inhome" -ef "$dot" ]; then
+    linktarget="$basepath/$ours"
+    chompy="$underhome"
+    while true; do
+	case "$chompy" in
+        *?/?*)
+	    linktarget="../$linktarget"
+	    chompy="${chompy%/*}"
+	    ;;
+	*)
+	    break
+	    ;;
+	esac
+    done
+    if [ "$inhome" -ef "$ours" ]; then
 	good "already symlinked here"
     elif [ -h "$inhome" ]; then
         bad "wrong symlink target"
     elif ! [ -e "$inhome" ]; then
 	needs setup "absent here"
-	$act ln -s "$basepath/$dot" "$inhome"
-    elif [ -f "$inhome" ] && [ -f "$dot" ]; then
-	if cmp -s "$dot" "$inhome"; then
-	    needs setup "identical here but not yet symlinked"
+	$act ln -s "$linktarget" "$inhome"
+    elif [ -f "$inhome" ] && [ -f "$ours" ]; then
+	if cmp -s "$ours" "$inhome"; then
+	    needs setup "identical in this ~ but not yet symlinked"
 	    $act rm -f "$inhome"~
-	    $act ln -s "$basepath/$dot" "$inhome"~
+	    $act ln -s "$linktarget" "$inhome"~
 	    $act mv -f "$inhome"~ "$inhome"
 	else
 	    needs import "modified here"
-	    $act rm -f "$dot"~
-	    $act cp "$inhome" "$dot"~
-	    $act mv -f "$dot"~ "$dot"
+	    $act rm -f "$ours"~
+	    $act cp "$inhome" "$ours"~
+	    $act mv -f "$ours"~ "$ours"
 	fi
-    elif [ -d "$inhome" ] && [ -d "$dot" ]; then
-	needs dirimport "directory here not yet symlinked"
-	$act mv "$dot" "$dot~"
-	$act ln -s "$basepath/$dot" "$inhome"~
-	$act mv "$inhome" "$dot"
+    elif [ -d "$inhome" ] && [ -d "$ours" ]; then
+	needs dirimport "directory in this ~, not yet symlinked"
+	$act mv "$ours" "$ours~"
+	$act ln -s "$linktarget" "$inhome"~
+	$act mv "$inhome" "$ours"
 	$act mv "$inhome~" "$inhome"
-	$act rm -rf "$dot~"
+	$act rm -rf "$ours~"
     else
 	bad "mismatched file types"
     fi
+}
+
+dots=$( find dot -mindepth 1 -maxdepth 1 -name '[0-9a-zA-Z]*[0-9a-zA-Z]' )
+
+for ours in $dots; do
+    underhome=".${ours#dot/}"
+    process_object
+done
+
+nondots=$( find home -mindepth 1 -maxdepth 1 -name '[0-9a-zA-Z]*[0-9a-zA-Z]' )
+
+for ours in $nondots; do
+    underhome="${ours#home/}"
+    process_object
+done
+
+exec 3<correspondences
+while read <&3 ours underhome; do
+    case "$ours" in
+    ''|'#'*) ;;
+    *)
+	case "$underhome" in
+	*/*)
+	    parent=${underhome%/*}
+	    punderhome="$HOME/$parent"
+	    prhome="~/${underhome%/*}"
+	    if [ -d "$punderhome" ]; then
+		good "directory exists"
+	    elif ! [ -e "$punderhome" ]; then
+		needs setup "directory does not exist"
+		$act mkdir -p "$punderhome"
+	    else
+		bad "ought to be director but isn't"
+	    fi
+	    ;;
+	esac
+	process_object
+	;;
+    esac
 done
 
 brokens=$(
     cd $HOME
-    find -L .[0-9a-zA-Z]* -maxdepth 0 -xdev -type l -lname "$basepath/dot/*"
+    find -L .[0-9a-zA-Z]* -maxdepth 0 -xdev -type l \
+	 \( -lname "$basepath/dot/*" -o -lname "$basepath/home/*" \)
 )
 for underhome in $brokens; do
     inhome="$HOME/$underhome"