aboutsummaryrefslogtreecommitdiff
path: root/trunk
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-12-24 16:03:47 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-12-24 16:03:47 +0000
commit531254e78ecf17a9ee263ccdfe79d211df4bb503 (patch)
tree423ce958d2622b2524548e7ef83bfc6bd8194e56 /trunk
parentfad88efce3eec11b5f7d0cf2688a3d6dbd66e0e0 (diff)
downloadsimplepkg-531254e78ecf17a9ee263ccdfe79d211df4bb503.tar.gz
simplepkg-531254e78ecf17a9ee263ccdfe79d211df4bb503.tar.bz2
minor fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@711 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk')
-rw-r--r--trunk/mkbuild/generic.mkSlackBuild2
-rw-r--r--trunk/mkbuild/kde4.mkSlackBuild2
-rw-r--r--trunk/mkbuild/perl.mkSlackBuild2
-rwxr-xr-xtrunk/src/mkbuild2
4 files changed, 4 insertions, 4 deletions
diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index 0036fa9..6253331 100644
--- 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 204d2c6..3e4cace 100644
--- 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 de16b08..ba98274 100644
--- 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 cd89fbe..bb5a9bf 100755
--- 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