commit e5f205a4ffd84ba6d42a15c871a63939998cfe1e
Author: Elan Ruusamäe <[email protected]>
Date: Tue Nov 6 15:09:17 2007 +0000
- typo, use sane variable name
Changed files:
adapter.sh -> 1.24
adapter.sh | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/adapter.sh b/adapter.sh
index 17f8d6e..e587c84 100644
--- a/adapter.sh
+++ b/adapter.sh
@@ -139,25 +139,26 @@ adapterize()
else
awk=awk
fi
- local diff=$tmpdir/$(basename SPECFILE) || exit
- $awk -f $adapter $SPECFILE > $diff || exit
- if [ "$(diff --brief $SPECFILE $diff)" ]; then
- diff -u $SPECFILE $diff > $diff.diff
+ local tmp=$tmpdir/$(basename $SPECFILE) || exit
+ $awk -f $adapter $SPECFILE > $tmp || exit
+
+ if [ "$(diff --brief $SPECFILE $tmp)" ]; then
+ diff -u $SPECFILE $tmp > $tmp.diff
if [ -t 1 ]; then
- diffcol $diff.diff | less -r
+ diffcol $tmp.diff | less -r
while : ; do
echo -n "Accept? (Yes, No, Confirm each
chunk)? "
read ans
case "$ans" in
[yYoO]) # y0 mama
- mv -f $diff $SPECFILE
+ mv -f $tmp $SPECFILE
echo "Ok, adapterized."
break
;;
[cC]) # confirm each chunk
- diff2hunks $diff.diff
- for t in $(ls $diff-*.diff); do
+ diff2hunks $tmp.diff
+ for t in $(ls $tmp-*.diff); do
diffcol $t |
less -r
echo -n
"Accept? (Yes, [N]o, Quit)? "
read ans
@@ -179,7 +180,7 @@ adapterize()
esac
done
else
- cat $diff.diff
+ cat $tmp.diff
fi
else
echo "The SPEC is perfect ;)"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
