diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-21 21:50:17 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-21 21:50:17 +0000 |
| commit | a9f211d4244900b0c0dc932893a3849a33891b96 (patch) | |
| tree | 2bdc78bcd9485cc9b0017783bfd18dbb9b0cba29 | |
| parent | 6afb0ae8409c51c7ee655ae6da73ad45d4fdfee3 (diff) | |
| download | simplepkg-a9f211d4244900b0c0dc932893a3849a33891b96.tar.gz simplepkg-a9f211d4244900b0c0dc932893a3849a33891b96.tar.bz2 | |
minor fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@700 04377dda-e619-0410-9926-eae83683ac58
| -rw-r--r-- | trunk/mkbuild/generic.mkSlackBuild | 6 | ||||
| -rwxr-xr-x | trunk/src/mkbuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild index e3c27dc..192023d 100644 --- a/trunk/mkbuild/generic.mkSlackBuild +++ b/trunk/mkbuild/generic.mkSlackBuild @@ -269,7 +269,7 @@ fi # Check Manifest file if [ -e "$CWD/Manifest" ]; then - for MANIFEST_LINE in `grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest`; do + grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | while read MANIFEST_LINE; do MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`" if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then @@ -283,7 +283,7 @@ if [ -e "$CWD/Manifest" ]; then fi SIZE_SRC="`wc -c $MANIFEST_FILE`" - SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }`" + SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`" # Check source code size if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then @@ -299,7 +299,7 @@ if [ -e "$CWD/Manifest" ]; then ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`" fi ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed 's/.* $ALGO //' | awk '{ print $1 }') - if [ "$ALGO_SRC" == "$ALGO_MANIFEST" ]; then + if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC" exit $ERROR_MANIFEST fi diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index 5466b18..9ab57a6 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -731,6 +731,10 @@ function file_metainfo { local size algo sum="" file="$1" file_type="`echo $2 | tr '[:lower:]' '[:upper:]'`" + if [ -d "$file" ]; then + return + fi + if [ -z "$file_type" ]; then file_type="AUX" fi |