From e74aeacc960a1fd2983b9bcff95c5492d453d22c Mon Sep 17 00:00:00 2001
From: Chizi123 <build@jsrv.com>
Date: Thu, 15 Oct 2020 02:37:25 +0000
Subject: [PATCH] Add package to waitlist if removed and waiting
---
main.sh | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/main.sh b/main.sh
index ce058ff..30b2c11 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
@@ -116,6 +116,15 @@
done
break
else
+ if [[ -z "$(grep $1 $REPODIR/.waitlist)" ]]; then
+ 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 +148,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