diff options
Diffstat (limited to 'trunk/src/createpkg')
| -rw-r--r-- | trunk/src/createpkg | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/trunk/src/createpkg b/trunk/src/createpkg index 2661788..f158a21 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -544,7 +544,7 @@ if [ $REMOVE_OLD_PACKAGE -eq $on ]; then PACKAGE_ARCH="`package_arch $PKG_NAME`" PACKAGE_BUILD="`package_build $PKG_NAME`" - for file in `ls $PACKAGE-*-*-*.tgz`; do + for file in `find . -name "$PACKAGE-*-*-*.*"`; do if svn_check $file; then # Just delete packages with different arch, version or build number if [ "`package_version $file`" != "$PACKAGE_VERSION" ] || \ @@ -556,11 +556,22 @@ if [ $REMOVE_OLD_PACKAGE -eq $on ]; then rm $file fi done + + for file in `find $MAKEPKG_REPOS -name "$PACKAGE.slack-required"`; do + if svn_check $file; then + if [ $MOVE_SLACK_REQUIRED -eq $off ]; then + svn del --force $file + elif [ ! -z "$SLACK_REQUIRED" ] && [ "$NEW_REPOS/$PACKAGE.slack-required" != "$file" ]; then + svn del --force $file + else + rm $file + fi cd $cwd else - rm $NEW_REPOS/$PACKAGE-*-*-*.tgz 2>/dev/null + find $MAKEPKG_REPOS -name "$PACKAGE-*-*-*.*" -exec rm {} 2>/dev/null \; + find $MAKEPKG_REPOS -name "$PACKAGE.slack-required" -exec rm {} 2>/dev/null \; fi fi @@ -597,10 +608,21 @@ fi # Update repository FILELIST.TXT, ... ( + cd $MAKEPKG_REPOS gen_filelist - gen_md5_checksums . gen_patches_filelist patches + + 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 + ) exit $EXIT_CODE |