$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 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"
dots=$( find dot -mindepth 1 -maxdepth 1 -name '[0-9a-zA-Z]*[0-9a-zA-Z]' )
-for dot in $dots; do
- ours="$dot"
- underhome=".${dot#dot/}"
+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
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"