minor fixes

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@711 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index 0036fa97cc7519b1ba0e7cb7a0375c8410c30d69..62533319847dea79a8b8fadc6195e034719f4c66 100644 (file)
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -308,7 +308,7 @@ if [ -e "$CWD/Manifest" ]; then
         ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
       fi
       ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
-      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed 's/.* $ALGO //' | awk '{ print $1 }')
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
       if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
         echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
         exit $ERROR_MANIFEST

diff --git a/trunk/mkbuild/kde4.mkSlackBuild b/trunk/mkbuild/kde4.mkSlackBuild
index 204d2c694e39bd41bcee5b0007a3479849866726..3e4cace2dec69f16f1e08952823f14a805d6f664 100644 (file)
--- a/trunk/mkbuild/kde4.mkSlackBuild
+++ b/trunk/mkbuild/kde4.mkSlackBuild
@@ -295,7 +295,7 @@ if [ -e "$CWD/Manifest" ]; then
         ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
       fi
       ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
-      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed 's/.* $ALGO //' | awk '{ print $1 }')
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
       if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
         echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
         exit $ERROR_MANIFEST

diff --git a/trunk/mkbuild/perl.mkSlackBuild b/trunk/mkbuild/perl.mkSlackBuild
index de16b089b0cc82451df9e7c4eedcb19048601fbc..ba98274830b3f6c97c75eb675a382ecdfe7bec72 100644 (file)
--- a/trunk/mkbuild/perl.mkSlackBuild
+++ b/trunk/mkbuild/perl.mkSlackBuild
@@ -256,7 +256,7 @@ if [ -e "$CWD/Manifest" ]; then
         ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
       fi
       ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
-      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed 's/.* $ALGO //' | awk '{ print $1 }')
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
       if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
         echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
         exit $ERROR_MANIFEST

diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index cd89fbe17af2acd3857583e154e15797762f7e47..bb5a9bfbd10bd2c92ae96a808315ed980edd91cf 100755 (executable)
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -896,7 +896,7 @@ function get_dist_file {
     echo "Trying to find $(basename $file) at $folders..."
 
     for path in $folders; do
-      for candidate in $(find $path -name $(basename $file)); do
+      for candidate in $(find $path -name $(basename $file) | grep -v "/\.svn"); do
         if [ ! -z "$candidate" ]; then
           break 2
         fi