fixes

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

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index a5310378b790158eb002a6b070385d07c4a0d26c..5538668f7d27513d0596a41bf1a36ef186dc00af 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -812,14 +812,13 @@ function gen_meta {
   # usage: gen_meta <package-file>
 
   if [ ! -f $1 ]; then
-    echo "File not found: $1"
-    exit 1;
+    return 1
   else
-    echo "Processing $1"
+    echo "Creating metafile for $1"
   fi
 
   if [ "`echo $1|grep -E '(.*{1,})\-(.*[\.\-].*[\.\-].*).tgz[ ]{0,}$'`" == "" ]; then
-    return;
+    return
   fi
 
   NAME=$(echo $1 | sed -re "s/(.*\/)(.*.tgz)$/\2/")

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 549e98f2000ced459f172814dc23aa9e0f735a9d..83ad801e21a45b70b2e4fa5d37492d016b2d6be6 100644 (file)
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -615,15 +615,17 @@ fi
   gen_filelist
   gen_patches_filelist patches
 
-  SUBFOLDER="`echo $NEW_REPOS | sed -e "s/^$(regexp_slash $MAKEPKG_REPOS)//"`"
+  SUBFOLDER="`echo $NEW_REPOS | sed -e "s/^$(regexp_slash $MAKEPKG_REPOS/)//"`"
   update_md5_checksum $MAKEPKG_REPOS $SUBFOLDER/$PKG_NAME
   gen_meta ./$SUBFOLDER/$PKG_NAME
 
   # update md5 file from patches/ folder if needed
-  for file in `find patches/ -name "$PACKAGE-*-*-*.tgz"`; do
-    SUBFOLDER="`echo $NEW_REPOS | sed -e "s/^$(regexp_slash $MAKEPKG_REPOS/patches)//"`"
-    update_md5_checksum $MAKEPKG_REPOS/patches $SUBFOLDER/$PKG_NAME
-  done
+  if [ -d "patches/" ]; then
+    for file in `find patches/ -name "$PACKAGE-*-*-*.tgz"`; do
+      SUBFOLDER="`echo $NEW_REPOS | sed -e "s/^$(regexp_slash $MAKEPKG_REPOS/patches)//"`"
+      update_md5_checksum $MAKEPKG_REPOS/patches $SUBFOLDER/$PKG_NAME
+    done
+  fi
 
 )