From 7ac53faa1544a9c8ace058a2721647f368b059a6 Mon Sep 17 00:00:00 2001 From: Chizi123 <build@jsrv.com> Date: Thu, 15 Oct 2020 02:41:30 +0000 Subject: [PATCH] Merge branch 'master' of https://github.com/Chizi123/Arch-autobuild-repo into master --- main.sh | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/main.sh b/main.sh index ce058ff..83e9c4a 100755 --- a/main.sh +++ b/main.sh @@ -58,7 +58,7 @@ "$1" == "ttf-win7-fonts" ]]; then makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) --skipchecksums else - makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) + makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) 2>&1 fi if [[ $? != 0 ]]; then #Register error @@ -70,7 +70,8 @@ source PKGBUILD pkgs=() for i in ${pkgname[@]}; do - pkgs+=("$i-$pkgver-$pkgrel") + #pkgs+=("$i-$pkgver-$pkgrel") + pkgs+=("$i") done #Move package to repodir and add to repo db @@ -116,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 @@ -139,6 +150,8 @@ sudo pacman -Syu --noconfirm fi + #Remove waitlist and errors from old builds + rm -f $REPODIR/{.waitlist,.errors} #update every package currently stored for d in $(find $BUILDDIR -maxdepth 1 -mindepth 1 -type d) do -- Gitblit v1.9.3