[pacman-dev] CVS update of pacman-lib/scripts (makepkg)

[Dan McGee]

    Date: Wednesday, February 28, 2007 @ 00:08:25
  Author: dan
    Path: /home/cvs-pacman/pacman-lib/scripts

Modified: makepkg (1.54 -> 1.55)

* Implemented Douglas' suggestion from the ML- print all integrity checks
  together while using makepkg -g.


---------+
 makepkg |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


Index: pacman-lib/scripts/makepkg
diff -u pacman-lib/scripts/makepkg:1.54 pacman-lib/scripts/makepkg:1.55
--- pacman-lib/scripts/makepkg:1.54	Mon Feb 26 03:43:02 2007
+++ pacman-lib/scripts/makepkg	Wed Feb 28 00:08:25 2007
@@ -675,6 +675,12 @@
 if [ "$NOEXTRACT" = "1" -o "$REPKG" = "1" ]; then
 	warning "Skipping source integrity checks -- using existing src/ tree"
 else
+	# TODO we end up checking $GENINTEG 3 times, could probably be refactored
+	if [ "$GENINTEG" = "1" ]; then
+		msg "Generating checksums for source files"
+		plain ""
+	fi
+
 	for integ in ${INTEGRITY_CHECK[@]}; do
 		integ="$(echo $integ | tr A-Z a-z)"
 		case "$integ" in
@@ -692,8 +698,6 @@
 
 		#Generate integrity checks
 		if [ "$GENINTEG" = "1" ]; then
-			msg "Generating ${integrity_name}s for source files"
-			plain ""
 			ct=0
 			numsrc=${#source[@]}
 			for netfile in "${source[@]}"; do
@@ -712,7 +716,6 @@
 					echo
 				fi
 			done
-			plain ""
 		#Validate integrity checks
 		else 
 			integrity_sums=($(eval echo \${${integrity_name}s[@]}))
@@ -744,6 +747,7 @@
 	done
 
 	if [ "$GENINTEG" = "1" ]; then
+		plain ""
 		exit 0
 	fi
 fi