fixed repo update and vc checking

Chizi123

2020-10-22 d219b833fbc6ef692cb92830e940a7be7fccc5ed

 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() {' 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 > $WAITLST_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
@@ -345,9 +350,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 +360,5 @@
      echo "All packages built successfully"
   fi
fi

rm $ERRORFILE $WAITLIST $WAITLIST_LCK