summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2008-09-02 07:18:28 +0200
committerAaron Griffin <aaronmgriffin@gmail.com>2008-09-02 07:18:28 +0200
commit0730a707da94ff30b94c1f7829c8d247ddf0eeb2 (patch)
tree313653f1912d074121efd9c3933fa6b2136573f7
parent4bef49c9d906a5388027eb5cbe694b0b6b93e807 (diff)
downloaddbscripts-0730a707da94ff30b94c1f7829c8d247ddf0eeb2.tar.gz
dbscripts-0730a707da94ff30b94c1f7829c8d247ddf0eeb2.tar.xz
Correctly remove old sourceballs without removing the wrong files
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rw-r--r--db-functions1
-rwxr-xr-xmisc-scripts/make-sourceball8
2 files changed, 8 insertions, 1 deletions
diff --git a/db-functions b/db-functions
index bcc25bb..25bca78 100644
--- a/db-functions
+++ b/db-functions
@@ -41,6 +41,7 @@ getpkgname() {
tmp=${1##*/}
tmp=${tmp%$PKGEXT}
+ tmp=${tmp%$SRCEXT}
tmp=${tmp%-$CARCH}
echo ${tmp%-*-*}
}
diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball
index ea5ef49..7f75fe8 100755
--- a/misc-scripts/make-sourceball
+++ b/misc-scripts/make-sourceball
@@ -52,7 +52,13 @@ create_srcpackage() {
if [ ! -d "$srcpath" ]; then
mkdir -p "$srcpath"
fi
- rm -f "$srcpath/${pkgname}-*-*${SRCEXT}"
+ #Remove old sourceballs
+ for pkg in "$srcpath/$pkgname-*"; do
+ pkg="$(basename $pkg)"
+ if "$(getpkgname $pkg)" == "$pkgname" ]; then
+ rm -f "$srcpath/$pkg"
+ fi
+ done
cp $pkg_file "$srcpath"
return 0