From 2c25db7f837aca99ac150fa91b2149849f0687b0 Mon Sep 17 00:00:00 2001 From: rhatto Date: Sun, 30 Aug 2009 23:38:25 +0000 Subject: Cleanup and bugfix for #94 and #95 (2) git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@813 04377dda-e619-0410-9926-eae83683ac58 --- trunk/src/createpkg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'trunk/src/createpkg') diff --git a/trunk/src/createpkg b/trunk/src/createpkg index 65af714..584e2e7 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -451,7 +451,7 @@ function remove_old_package_data { else # Using -mindepth 2 so it doesn't delete the new package - find $makepkg_repos -mindepth 2 $(package_ext_find $PACKAGE-*-*-*) -exec rm {} 2>/dev/null \; + find $makepkg_repos -mindepth 2 $(pkg_ext_find $PACKAGE-*-*-*) -exec rm {} 2>/dev/null \; find $makepkg_repos -mindepth 2 -name "$PACKAGE-*-*-*.meta" -exec rm {} 2>/dev/null \; find $makepkg_repos -mindepth 2 -name "$PACKAGE-*-*-*.*.asc" -exec rm {} 2>/dev/null \; find $makepkg_repos -name "$PACKAGE.slack-required" -exec rm {} 2>/dev/null \; @@ -486,7 +486,7 @@ function update_metadata { found_patch="no" - for file in `find patches/ $(package_ext_find $PACKAGE-*-*-*)`; do + for file in `find patches/ $(pkg_ext_find $PACKAGE-*-*-*)`; do found_patch="yes" update_md5_checksum $makepkg_repos/patches patches/$SUBFOLDER/$PKG_NAME done @@ -513,7 +513,7 @@ function list_packages { for repository in $repositories; do echo "Packages from $repository..." - find $repository $(package_ext_find) + find $repository $(pkg_ext_find) done } @@ -539,7 +539,7 @@ function remove_package { cd $repository - for file in `find . $(package_ext_find $package-*-*-*) -o -name "$package-*-*-*.meta" -o -name "$package-*-*-*.*.asc"`; do + for file in `find . $(pkg_ext_find $package-*-*-*) -o -name "$package-*-*-*.meta" -o -name "$package-*-*-*.*.asc"`; do svn_del $file if [ -e "CHECKSUMS.md5" ] && echo $file | grep -q -E -e "$(pkg_ext_grep)$"; then # remove md5 information -- cgit v1.2.3