From b2c2b530b6ccdf72286ad1c31076745a7c00fcb5 Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Thu, 15 Oct 2020 02:36:15 +0000 Subject: [PATCH] Dont match package version due to git packages --- main.sh | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/main.sh b/main.sh index 6b11a67..dadd091 100755 --- a/main.sh +++ b/main.sh @@ -66,10 +66,20 @@ return 1 fi + #Get build artifact names + source PKGBUILD + pkgs=() + for i in ${pkgname[@]}; do + #pkgs+=("$i-$pkgver-$pkgrel") + pkgs++("$i") + done + #Move package to repodir and add to repo db - rm $REPODIR/*$1*.pkg.tar.??* - cp *$1*.pkg.tar.?? $REPODIR/ - [[ "$SIGN" == "Y" ]] && cp *$1*.pkg.tar.??.sig $REPODIR/ + for i in ${pkgs[@]}; do + rm $REPODIR/$i*.pkg.tar.??* + cp $i*.pkg.tar.?? $REPODIR/ + [[ "$SIGN" == "Y" ]] && cp $i*.pkg.tar.??.sig $REPODIR/ + done # Weird exceptions if [[ "$1" == "zoom" ]]; then @@ -90,7 +100,9 @@ while true; do # Wait until package is at the top of the queue and add to db if [[ "$(head -n1 $REPODIR/.waitlist)" == "$1" ]]; then - repo-add $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/*$1*.pkg.tar.?? + for i in ${pkgs[@]}; do + repo-add $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/$i*.pkg.tar.?? + done while true; do if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then sleep 1 @@ -105,6 +117,16 @@ done 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 + echo 1 > $REPODIR/.waitlist.lck + echo $1 >> $REPODIR/.waitlist + echo 0 > $REPODIR/.waitlist.lck + fi + fi sleep 10 fi done -- Gitblit v1.9.3