chiark
/
gitweb
/
~ian
/
ian-dotfiles.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5f8e67c
)
Slightly improve a couple of messages
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 16 Dec 2015 20:40:35 +0000
(20:40 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 16 Dec 2015 20:40:35 +0000
(20:40 +0000)
infra/makelinks
patch
|
blob
|
history
diff --git
a/infra/makelinks
b/infra/makelinks
index 6f4310782957039f5f0c026cbbc79db67451d2dd..f4d502c465045d940bdb2b1c9f5942b813acbb04 100755
(executable)
--- a/
infra/makelinks
+++ b/
infra/makelinks
@@
-85,7
+85,7
@@
process_object () {
$act ln -s "$linktarget" "$inhome"
elif [ -f "$inhome" ] && [ -f "$ours" ]; then
if cmp -s "$ours" "$inhome"; then
$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"
$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
$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"
$act mv "$ours" "$ours~"
$act ln -s "$linktarget" "$inhome"~
$act mv "$inhome" "$ours"