]> git.pld-linux.org Git - packages/adapter.git/commitdiff
- typo, use sane variable name
authorElan Ruusamäe <glen@pld-linux.org>
Tue, 6 Nov 2007 15:09:17 +0000 (15:09 +0000)
committerElan Ruusamäe <glen@pld-linux.org>
Tue, 6 Nov 2007 15:09:17 +0000 (15:09 +0000)
Changed files:
    adapter.sh -> 1.24

adapter.sh

index 17f8d6ef8d85b17a13f1d780b88f10455b65a133..e587c8462413668cf39f38f89227cd7d8a480b8d 100644 (file)
@@ -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 ;)"
This page took 0.036991 seconds and 4 git commands to generate.