From 60adbdc4ec1b9b62ea92c818d30dc4114a70048d Mon Sep 17 00:00:00 2001 From: Chizi123 <build@jsrv.com> Date: Fri, 23 Oct 2020 07:10:39 +0000 Subject: [PATCH] allow spacing in pkgver() --- main.sh | 51 ++++++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/main.sh b/main.sh index 6f4f791..1cd4aef 100755 --- a/main.sh +++ b/main.sh @@ -4,6 +4,10 @@ source $(dirname "$(realpath $0)")/vars.sh +ERRORFILE=$(mktemp) +WAITLIST=$(mktemp) +WAITLIST_LCK=$(mktemp) + #Helper for finding newest and oldest files #Sourced from stack overflow # Usage: newold_matching_file [n/o] [filename] @@ -43,7 +47,7 @@ # 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 $(grep 'pkgver() {' PKGBUILD) && -z $2 ]]; then + if [[ -n "$(git pull | grep 'Already up to date.')" && -z "$(grep 'pkgver[[:space:]]() {' PKGBUILD)" && -z "$2" ]]; then return 2 fi @@ -62,7 +66,7 @@ fi if [[ $? != 0 ]]; then #Register error - echo $1 >> $REPODIR/.errors + echo $1 >> $ERRORFILE return 1 fi @@ -107,43 +111,46 @@ # Add package to waiting list to be added to repo db while true; do - if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then + if [[ $(cat $WAITLIST_LCK) == 1 ]]; then sleep 1 else - echo 1 > $REPODIR/.waitlist.lck - echo $1 >> $REPODIR/.waitlist - echo 0 > $REPODIR/.waitlist.lck + echo 1 > $WAITLIST_LCK + echo $1 >> $WAITLIST + echo 0 > $WAITLIST_LCK break fi done while true; do # Wait until package is at the top of the queue and add to db - if [[ "$(head -n1 $REPODIR/.waitlist)" == "$1" ]]; then + if [[ "$(head -n1 $WAITLIST)" == "$1" ]]; then # for i in ${pkgs[@]}; do repo-add $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.$([ -n "$COMPRESSION" ] || echo $COMPRESSION && echo zst) ${pkgs[@]} # done while true; do - if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then + if [[ $(cat $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 + echo 1 > $WAITLIST_LCK + TEMP=$(mktemp) + tail -n +2 $WAITLIST > $TEMP + cp $TEMP $WAITLIST + rm $TEMP + unset TEMP + echo 0 > $WAITLIST_LCK break fi done break else - if [[ -z "$(grep $1 $REPODIR/.waitlist)" ]]; then + if [[ -z "$(grep $1 $WAITLIST)" ]]; then # Not on waitlist for some reason, need to readd - if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then + if [[ $(cat $WAITLIST_LCK) == 1 ]]; then sleep 1 else - echo 1 > $REPODIR/.waitlist.lck - echo $1 >> $REPODIR/.waitlist - echo 0 > $REPODIR/.waitlist.lck + echo 1 > $WAITLIST_LCK + echo $1 >> $WAITLIST + echo 0 > $WAITLIST_LCK fi fi sleep 10 @@ -169,8 +176,6 @@ 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 @@ -247,7 +252,6 @@ rmlist="$rmlist $(comm -12 <(pacman -Slq $REPONAME | sort) <(pacman -Slq core | sort) | tr '\n' ' ')" rmlist="$rmlist $(comm -12 <(pacman -Slq $REPONAME | sort) <(pacman -Slq extra | sort) | tr '\n' ' ')" rmlist="$rmlist $(comm -12 <(pacman -Slq $REPONAME | sort) <(pacman -Slq community | sort) | tr '\n' ' ')" - removed=() TMPFILE=$(mktemp) for i in $(find $BUILDDIR -mindepth 1 -maxdepth 1 -type d); do check_pkg $TMPFILE "$(echo $i | rev | cut -d'/' -f1 | rev)" & @@ -345,9 +349,8 @@ # Error reporting, send email only for build-all as assuming an batch job for that if [[ $1 == "build-all" || $1 == "add" ]]; then - if [[ -f $REPODIR/.errors ]]; then - ERRORS=$(cat $REPODIR/.errors | tr '\n' ' ') - rm $REPODIR/.errors + if [[ -n $(cat $ERRORFILE) ]]; then + ERRORS=$(cat $ERRORFILE | tr '\n' ' ') echo "Errors in packages: $ERRORS" if [[ "$EMAIL" != "" && "$1" == "build-all" ]]; then send_email $ERRORS @@ -356,3 +359,5 @@ echo "All packages built successfully" fi fi + +rm $ERRORFILE $WAITLIST $WAITLIST_LCK -- Gitblit v1.9.3