diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-27 20:29:45 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-27 20:29:45 +0000 |
| commit | 2a2af1cc4b522c1c58dff472b7fa9b51dbbb85ed (patch) | |
| tree | 9bd68f3994ec47e5643a4bae28ef5a4a61c42af3 | |
| parent | 424d255a67875ce5fe8a39696ec2d9dfe08882f8 (diff) | |
| download | simplepkg-2a2af1cc4b522c1c58dff472b7fa9b51dbbb85ed.tar.gz simplepkg-2a2af1cc4b522c1c58dff472b7fa9b51dbbb85ed.tar.bz2 | |
fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@553 04377dda-e619-0410-9926-eae83683ac58
| -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 ) |