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 | 120 ++++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 81 insertions(+), 39 deletions(-) diff --git a/main.sh b/main.sh index 071965c..30b2c11 100755 --- a/main.sh +++ b/main.sh @@ -40,7 +40,7 @@ } #Build latest version of a package -# Usage: build_pkg [package name] [new?] [-f force] +# Usage: build_pkg [package name] [-f force] function build_pkg { #check if PKGBUILD has updated, don't rebuild if hasn't changed if [[ ! -z $(git pull | grep "Already up to date.") && -z $(echo $1 | grep git) && -z $2 ]]; then @@ -48,23 +48,46 @@ fi #remove old versions before build - rm *$1*.pkg.tar.xz* + rm *$1*.pkg.tar.* #make and force rebuild if is git package - makepkg -s --noconfirm $([ $CLEAN == "Y" ] && echo "-c") $([ $SIGN == "Y" ] && echo "--sign --key $KEY") $([ "$2" == "-f" ] && echo -f) - if [ $? != 0 ]; then + # Mictosoft fonts have problems with checksums and need a seperate argument + if [[ "$1" == "ttf-ms-win10" || + "$1" == "ttf-office-2007-fonts" || + "$1" == "ttf-ms-win8" || + "$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) 2>&1 + fi + if [[ $? != 0 ]]; then #Register error echo $1 >> $REPODIR/.errors return 1 fi + #Get build artifact names + source PKGBUILD + pkgs=() + for i in ${pkgname[@]}; do + pkgs+=("$i-$pkgver-$pkgrel") + done + #Move package to repodir and add to repo db - rm $REPODIR/*$1*.pkg.tar.xz* - cp *$1*.pkg.tar.xz $REPODIR/ - [ "$SIGN" == "Y" ] && cp *$1*.pkg.tar.xz.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 + rm zoom*_orig*.pkg.tar.xz + fi + # Add package to waiting list to be added to repo db - while [ 1 ]; do - if [ $(cat $REPODIR/.waitlist.lck) == 1 ]; then + while true; do + if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then sleep 1 else echo 1 > $REPODIR/.waitlist.lck @@ -73,12 +96,14 @@ break fi done - while [ 1 ]; do + 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.xz - while [ 1 ]; do - if [ $(cat $REPODIR/.waitlist.lck) == 1 ]; then + 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.?? + done + while true; do + if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then sleep 1 else # Remove self from top of queue @@ -91,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 @@ -110,15 +144,21 @@ # Usage: build_all [-f force] function build_all { #system update - if [ $UPDATE == "Y" ]; then + if [[ $UPDATE == "Y" ]]; then 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 cd $d - build_pkg $(echo $d | rev | cut -d'/' -f1 | rev) $1 > /dev/null & + if [[ "$PARALLEL" == "Y" ]]; then + build_pkg $(echo $d | rev | cut -d'/' -f1 | rev) $1 &> $([[ "$QUIET" == "Y" ]] && echo "/dev/null" || echo "/dev/tty") & + else + build_pkg $(echo $d | rev | cut -d'/' -f1 | rev) $1 &> $([[ "$QUIET" == "Y" ]] && echo "/dev/null" || echo "/dev/tty") + fi done wait @@ -133,7 +173,7 @@ cd $BUILDDIR git clone https://aur.archlinux.org/$i.git cd $i - build_pkg $i new -f + build_pkg $i -f done return 0 } @@ -152,24 +192,24 @@ #Set variables before usage # Usage: init function init { - if [ $uid != 1 ]; then + if [[ $uid != 1 ]]; then echo "This must be run as root" fi #check for configuration here - [ -z $REPODIR ] && echo "Enter REPODIR" && return 1 - [ -z $BUILDDIR ] && echo "Enter BUILDDIR" && return 2 - [ -z $REPONAME ] && echo "Enter REPONAME" && return 3 + [[ -z $REPODIR ]] && echo "Enter REPODIR" && return 1 + [[ -z $BUILDDIR ]] && echo "Enter BUILDDIR" && return 2 + [[ -z $REPONAME ]] && echo "Enter REPONAME" && return 3 #make build directories - [ ! -d $REPODIR ] && mkdir -p $REPODIR - [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR + [[ ! -d $REPODIR ]] && mkdir -p $REPODIR + [[ ! -d $BUILDDIR ]] && mkdir -p $BUILDDIR #packages required to build others pacman -S --noconfirm base-devel git #add repo to pacman.conf so can install own packages - if [ -z $(grep "$REPONAME" /etc/pacman.conf) ]; then + if [[ -z $(grep "$REPONAME" /etc/pacman.conf) ]]; then printf "[$REPONAME]\nSigLevel = Optional TrustAll\nServer = file://$REPODIR\n" >> /etc/pacman.conf fi @@ -201,7 +241,7 @@ echo "To: $EMAIL" echo "Subject: Build errors" echo "There were build errors for the build of $REPONAME at $(date), please address them soon." - echo "The errors were: $1" + echo "The errors were: $@" ) | sendmail -t } @@ -209,22 +249,24 @@ "init") init;; "add") - add $2;; + add ${@:2};; "build-all") - build_all $([ "$2" == "-f" ] && echo "-f") - if [ -f $REPODIR/.errors ]; then - ERRORS=$(cat $REPODIR/.errors | tr '\n' ' ') - rm $REPODIR/.errors - echo "Errors in packages: $ERRORS" - if [ "$EMAIL" != "" ]; then - send_email $ERRORS - fi - else - echo "All packages built successfully" - fi - ;; + build_all $([[ "$2" == "-f" ]] && echo "-f");; "remove") - remove $2;; + remove ${@:2};; *) printf "Invalid usage\nUsage: $0 init|add|build-all\n";; esac + +# Error reporting, send email only for build-all as assuming an batch job for that +if [[ -f $REPODIR/.errors ]]; then + ERRORS=$(cat $REPODIR/.errors | tr '\n' ' ') + rm $REPODIR/.errors + echo "Errors in packages: $ERRORS" + if [[ "$EMAIL" != "" && "$1" == "build-all" ]]; then + send_email $ERRORS + fi +else + echo "All packages built successfully" +fi + -- Gitblit v1.9.3