From: Elan Ruusamäe <glen@pld-linux.org>
Date: Tue, 6 Nov 2007 15:09:17 +0000 (+0000)
Subject: - typo, use sane variable name
X-Git-Tag: auto/th/adapter-1.514-1~247
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=e5f205a4ffd84ba6d42a15c871a63939998cfe1e;p=packages%2Fadapter.git

- typo, use sane variable name

Changed files:
    adapter.sh -> 1.24
---

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 ;)"