--- a/lib/update.updates Mon Dec 16 21:53:41 2013 +0200
+++ b/lib/update.updates Tue Dec 17 00:04:00 2013 +0200
@@ -36,10 +36,10 @@
[ $update ] && continue
# check
- if [ ! -e $ROOT/$dep ]; then
+ if [ ! -e $dep ]; then
fail "$out: Missing source: $dep"
- elif [ $ROOT/$out -ot $ROOT/$dep ]; then
+ elif [ $out -ot $dep ]; then
debug " update: $dep"
update=y
else
@@ -64,14 +64,14 @@
local tmp=$out.new
debug "$out"
- cmd "$@" > $ROOT/$tmp
+ cmd "$@" > $tmp
# compare
- if [ -e $ROOT/$out ] && [ $UPDATE_DIFF ]; then
+ if [ -e $out ] && [ $UPDATE_DIFF ]; then
debug " changes:"
# terse
- indent " " diff --unified=1 $ROOT/$out $ROOT/$tmp || true
+ indent " " diff --unified=1 $out $tmp || true
fi
# deploy
@@ -79,12 +79,12 @@
# cleanup
debug " no-op"
- cmd rm $ROOT/$tmp
+ cmd rm $tmp
else
# commit
debug " deploy"
- cmd mv $ROOT/$tmp $ROOT/$out
+ cmd mv $tmp $out
fi
}
@@ -99,7 +99,7 @@
local tgt=-
for tgt in "$@"; do
- [ $tgt != $out ] && [ -e $ROOT/$tgt ] && break
+ [ $tgt != $out ] && [ -e $tgt ] && break
done
echo $tgt
@@ -116,9 +116,9 @@
local lnk=$1
local tgt=$2
- [ ! -e $ROOT/$tgt ] && fail "$tgt: target does not exist"
+ [ ! -e $tgt ] && fail "$tgt: target does not exist"
- [ ! -e $ROOT/$lnk ] || [ $(readlink $ROOT/$lnk) != $ROOT/$tgt ]
+ [ ! -e $lnk ] || [ $(readlink $lnk) != $tgt ]
}
## Update symlink to point to target:
@@ -129,6 +129,6 @@
local lnk=$1
local tgt=$2
- cmd ln -sf $ROOT/$tgt $ROOT/$lnk
+ cmd ln -sf $tgt $lnk
}