From e72b38a05a3fd96ab7b057ebb6b3619867be1496 Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Mon, 21 Sep 2020 12:25:51 +0000 Subject: [PATCH] Added comments describing threading --- main.sh | 96 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 69 insertions(+), 27 deletions(-) diff --git a/main.sh b/main.sh index 62d0f10..071965c 100755 --- a/main.sh +++ b/main.sh @@ -2,9 +2,7 @@ #A basic bash script to automate the building of arch packages # Usage: main.sh init|add|build_all [-f force] -source vars.sh - -ERRORS="" +source $(dirname "$(realpath $0)")/vars.sh #Helper for finding newest and oldest files #Sourced from stack overflow @@ -56,19 +54,46 @@ makepkg -s --noconfirm $([ $CLEAN == "Y" ] && echo "-c") $([ $SIGN == "Y" ] && echo "--sign --key $KEY") $([ "$2" == "-f" ] && echo -f) if [ $? != 0 ]; then #Register error - ERRORS="$ERRORS $1" + echo $1 >> $REPODIR/.errors return 1 fi - #copy package to repo directory - #latest="$(newold_matching_file n '*.pkg.tar.xz')" - #or f in $(find g.tar.xz' - #o + #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 - repo-add $([ "$SIGN" == "Y" ] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/*$1*.pkg.tar.xz - #one + # Add package to waiting list to be added to repo db + while [ 1 ]; do + if [ $(cat $REPODIR/.waitlist.lck) == 1 ]; then + sleep 1 + else + echo 1 > $REPODIR/.waitlist.lck + echo $1 >> $REPODIR/.waitlist + echo 0 > $REPODIR/.waitlist.lck + break + fi + done + while [ 1 ]; 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 + sleep 1 + else + # Remove self from top of queue + echo 1 > $REPODIR/.waitlist.lck + tail -n +2 $REPODIR/.waitlist > $REPODIR/.waitlist.tmp + mv $REPODIR/.waitlist.tmp $REPODIR/.waitlist + echo 0 > $REPODIR/.waitlist.lck + break + fi + done + break + else + sleep 10 + fi + done #Remove old versions of packages #TODO: Want to be able to keep multiple versions of old packages, future work @@ -93,8 +118,9 @@ for d in $(find $BUILDDIR -maxdepth 1 -mindepth 1 -type d) do cd $d - build_pkg $(echo $d | rev | cut -d'/' -f1 | rev) $1 + build_pkg $(echo $d | rev | cut -d'/' -f1 | rev) $1 > /dev/null & done + wait return 0 } @@ -103,25 +129,33 @@ #There is no name checking so be sure to put in the name correctly # Usage: add [package name] function add { - cd $BUILDDIR - git clone https://aur.archlinux.org/$1.git - cd $1 - build_pkg $1 new -f + for i in $@; do + cd $BUILDDIR + git clone https://aur.archlinux.org/$i.git + cd $i + build_pkg $i new -f + done return 0 } #Remove a package from the build list and repository # Usage remove [package name] function remove { - rm -rf $BUILDDIR/$1* - repo-remove $REPODIR/$REPONAME.db.tar.xz $1 - rm $REPODIR/$1* + for i in $@; do + rm -rf $BUILDDIR/$i* + repo-remove $REPODIR/$REPONAME.db.tar.xz $i + rm $REPODIR/$i* + done } #Check config and create build folders #Set variables before usage # Usage: init function init { + 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 @@ -132,7 +166,7 @@ [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR #packages required to build others - sudo pacman -S --noconfirm base-devel git + pacman -S --noconfirm base-devel git #add repo to pacman.conf so can install own packages if [ -z $(grep "$REPONAME" /etc/pacman.conf) ]; then @@ -140,7 +174,7 @@ fi #create GPG key for package signing - if [ "$SIGN" == "Y" && "$KEY" == "" ]; then + if [[ "$SIGN" == "Y" && "$KEY" == "" ]]; then ( echo "Key-Type: RSA" echo "Key-Length: 2048" @@ -161,6 +195,16 @@ return 0 } +function send_email { + ( + echo "From: build@localhost" + 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" + ) | sendmail -t +} + case $1 in "init") init;; @@ -168,14 +212,12 @@ add $2;; "build-all") build_all $([ "$2" == "-f" ] && echo "-f") - if [ "$ERRORS" != "" ]; then - echo "Errors in packages $ERRORS" + if [ -f $REPODIR/.errors ]; then + ERRORS=$(cat $REPODIR/.errors | tr '\n' ' ') + rm $REPODIR/.errors + echo "Errors in packages: $ERRORS" if [ "$EMAIL" != "" ]; then - echo "To: $EMAIL - Subject: Build errors - - There were build errors for the build at $(date), please address them soon - The errors were: $ERRORS" | sendmail -t + send_email $ERRORS fi else echo "All packages built successfully" -- Gitblit v1.9.3