don't publish *.old files

3 files changed, 4 insertions, 7 deletions

diff --git a/cron-jobs/create-filelists b/cron-jobs/create-filelists
index 84867d8..a25fd1a 100755
--- a/cron-jobs/create-filelists
+++ b/cron-jobs/create-filelists
@@ -88,8 +88,7 @@ for repo in $repos; do
             pkgdir="${targetdir}/${repodir}"
             mkdir -p "$pkgdir"
             cd "${TMPDIR}/${repodir}"
-            [ -f "${pkgdir}/${FILES_DB_FILE}.old" ] && rm "${pkgdir}/${FILES_DB_FILE}.old"
-            [ -f "${pkgdir}/${FILES_DB_FILE}" ] && mv "${pkgdir}/${FILES_DB_FILE}" "${pkgdir}/${FILES_DB_FILE}.old"
+            [ -f "${pkgdir}/${FILES_DB_FILE}" ] && rm "${pkgdir}/${FILES_DB_FILE}"
             bsdtar --exclude=*${DBEXT//\.db/} -c${TAR_OPT}f "${pkgdir}/${FILES_DB_FILE}" *
         fi
     done
diff --git a/db-move b/db-move
index c5bd32e..ca1b5da 100755
--- a/db-move
+++ b/db-move
@@ -88,8 +88,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 		if [ -f "$ftppath_from/$architecture/$repofrom$DBEXT" ]; then
 		    /bin/cp "$ftppath_from/$architecture/$repofrom$DBEXT" .
 		    /usr/bin/repo-remove -q "$repofrom$DBEXT" ${pkgname[@]} || die "Error in repo-remove"
-		    #use '*' to move the old DB too
-		    mv $repofrom$DBEXT* "$ftppath_from/$architecture"
+		    mv $repofrom$DBEXT "$ftppath_from/$architecture"
 		    echo "    Package files will be cleaned up automatically"
 		fi
 
@@ -104,8 +103,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then
 			/bin/cp $_cpkgfile .
 			/usr/bin/repo-add -q "$repoto$DBEXT" $_pkgfile || die "Error in repo-add $_pkgfile"
 		done
-		#use '*' to move the old DB too
-		mv $repoto$DBEXT* $ftppath_to/$architecture
+		mv $repoto$DBEXT $ftppath_to/$architecture
         for i in ${pkgname[@]}; do
             _pkgfile=$(getpkgfile "$i-$pkgver-$pkgrel-$_arch"$PKGEXT)
             [ $? -gt 0 ] && die
diff --git a/db-update b/db-update
index 0973bf3..82d2e25 100755
--- a/db-update
+++ b/db-update
@@ -236,7 +236,7 @@ for current_arch in ${ARCHES[@]}; do
 				fi
 			done
 		fi
-		if ! /bin/cp "$WORKDIR/build/$reponame.db"* "$ftppath/"; then
+		if ! /bin/cp "$WORKDIR/build/$reponame$DBEXT" "$ftppath/"; then
 			die "failed to move repository $reponame-$current_arch".
 		fi
 	else