From 5c7d3944cda03a29ae6349ec4bd058e405c3b8f4 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Tue, 23 Dec 2008 21:24:11 +0000
Subject: mkbuild: adding --update-manifest and other changes (see CHANGELOG)

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@707 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/mkbuild/generic.mkSlackBuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'trunk/mkbuild/generic.mkSlackBuild')

diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index fbc7b4a..0036fa9 100644
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -275,6 +275,7 @@ if [ -e "$CWD/Manifest" ]; then
 
     MANIFEST_LINE="`head -n $MANIFEST_COUNT $CWD/Manifest | tail -n 1`"
     MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
 
     if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
       MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
@@ -286,7 +287,7 @@ if [ -e "$CWD/Manifest" ]; then
       continue
     fi
 
-    echo "Checking Manifest for $MANIFEST_FILE integrity..."
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
 
     SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
     SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
@@ -295,6 +296,8 @@ if [ -e "$CWD/Manifest" ]; then
     if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
       echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
       exit $ERROR_MANIFEST
+    else
+      echo "Size match."
     fi
 
     # Check source code integrity
@@ -309,6 +312,8 @@ if [ -e "$CWD/Manifest" ]; then
       if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
         echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
         exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
       fi
     done
 
-- 
cgit v1.2.3