diff options
| -rw-r--r-- | trunk/lib/common.sh | 7 | ||||
| -rw-r--r-- | trunk/src/createpkg | 12 |
2 files changed, 10 insertions, 9 deletions
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index a531037..5538668 100644 --- 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 549e98f..83ad801 100644 --- 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 ) |