SPECS: adapter - typo, use sane variable name

glen glen at pld-linux.org
Tue Nov 6 16:09:22 CET 2007


Author: glen                         Date: Tue Nov  6 15:09:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- typo, use sane variable name

---- Files affected:
SPECS:
   adapter (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/adapter
diff -u SPECS/adapter:1.23 SPECS/adapter:1.24
--- SPECS/adapter:1.23	Tue Nov  6 16:03:41 2007
+++ SPECS/adapter	Tue Nov  6 16:09:17 2007
@@ -139,25 +139,26 @@
 	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 @@
 					esac
 				done
 		else
-				cat $diff.diff
+				cat $tmp.diff
 		fi
 	else
 		echo "The SPEC is perfect ;)"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/adapter?r1=1.23&r2=1.24&f=u



More information about the pld-cvs-commit mailing list