X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=infra%2Fmakelinks;h=f4d502c465045d940bdb2b1c9f5942b813acbb04;hb=e466653b0879184e26ae58051e0aa9c158efdcf6;hp=f3b051053bd73b2a643e2c09bee83e9695082b07;hpb=0d8c83fa3dd434bf8392fd4fca9acdc8296f020f;p=ian-dotfiles.git

diff --git a/infra/makelinks b/infra/makelinks
index f3b0510..f4d502c 100755
--- a/infra/makelinks
+++ b/infra/makelinks
@@ -44,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 () {
@@ -85,7 +85,7 @@ process_object () {
 	$act ln -s "$linktarget" "$inhome"
     elif [ -f "$inhome" ] && [ -f "$ours" ]; then
 	if cmp -s "$ours" "$inhome"; then
-	    needs setup "identical here but not yet symlinked"
+	    needs setup "identical in this ~ but not yet symlinked"
 	    $act rm -f "$inhome"~
 	    $act ln -s "$linktarget" "$inhome"~
 	    $act mv -f "$inhome"~ "$inhome"
@@ -96,7 +96,7 @@ process_object () {
 	    $act mv -f "$ours"~ "$ours"
 	fi
     elif [ -d "$inhome" ] && [ -d "$ours" ]; then
-	needs dirimport "directory here not yet symlinked"
+	needs dirimport "directory in this ~, not yet symlinked"
 	$act mv "$ours" "$ours~"
 	$act ln -s "$linktarget" "$inhome"~
 	$act mv "$inhome" "$ours"