From a2d95e38d1bbaf3b84f4a725412e4f6bd7de206d Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Thu, 15 Oct 2020 06:59:18 +0000
Subject: [PATCH] reordered variables, hopefully makes more sense
---
main.sh | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/main.sh b/main.sh
index 83e9c4a..d0cb1fb 100755
--- a/main.sh
+++ b/main.sh
@@ -71,14 +71,19 @@
pkgs=()
for i in ${pkgname[@]}; do
#pkgs+=("$i-$pkgver-$pkgrel")
- pkgs+=("$i")
+ pkgs+=("$(find . -mindepth 1 -maxdepth 1 -type f -name "$1*.pkg.tar.*" -not -name "*.sig" | sed 's/^\.\///')")
done
#Move package to repodir and add to repo db
+ #Dont change the database if rebuilt the same package at same release and version
for i in ${pkgs[@]}; do
- rm $REPODIR/$i*.pkg.tar.??*
- cp $i*.pkg.tar.?? $REPODIR/
- [[ "$SIGN" == "Y" ]] && cp $i*.pkg.tar.??.sig $REPODIR/
+ if [[ -f $REPODIR/$i ]]; then
+ pkgs=${pkgs[@]/$i}
+ else
+ rm $REPODIR/*$1*.pkg.tar.*
+ cp $i $REPODIR/
+ [[ "$SIGN" == "Y" ]] && cp $i.sig $REPODIR/
+ fi
done
# Weird exceptions
@@ -101,7 +106,7 @@
# Wait until package is at the top of the queue and add to db
if [[ "$(head -n1 $REPODIR/.waitlist)" == "$1" ]]; then
for i in ${pkgs[@]}; do
- repo-add $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/$i*.pkg.tar.??
+ repo-add $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/$i
done
while true; do
if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then
--
Gitblit v1.9.3