From d4b7a7e9735356e7b44e45b606e054191ca46452 Mon Sep 17 00:00:00 2001
From: Chizi123 <build@jsrv.com>
Date: Thu, 15 Oct 2020 06:54:15 +0000
Subject: [PATCH] more specific package locating and not readding the same packages
---
main.sh | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/main.sh b/main.sh
index 30b2c11..d0cb1fb 100755
--- a/main.sh
+++ b/main.sh
@@ -70,14 +70,20 @@
source PKGBUILD
pkgs=()
for i in ${pkgname[@]}; do
- pkgs+=("$i-$pkgver-$pkgrel")
+ #pkgs+=("$i-$pkgver-$pkgrel")
+ 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
@@ -100,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
@@ -117,6 +123,7 @@
break
else
if [[ -z "$(grep $1 $REPODIR/.waitlist)" ]]; then
+ # Not on waitlist for some reason, need to readd
if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then
sleep 1
else
--
Gitblit v1.9.3