From 4ebf3d611acf7eae221c10aee1d01848d8d701cc Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Mon, 21 Sep 2020 12:15:54 +0000
Subject: [PATCH] Fixed init to work on bare VM
---
main.sh | 80 ++++++++++++++++++++++++++++++---------
1 files changed, 61 insertions(+), 19 deletions(-)
diff --git a/main.sh b/main.sh
index 64be697..016623f 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
@@ -50,24 +48,50 @@
fi
#remove old versions before build
- rm $1*.pkg.tar.xz
+ rm *$1*.pkg.tar.xz*
#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
#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
- rm $REPODIR/$1*.pkg.tar.xz
- cp $1*.pkg.tar.xz $REPODIR/
- repo-add $([ "$SIGN" == "Y" ] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/$1*.pkg.tar.xz
- #one
+ rm $REPODIR/*$1*.pkg.tar.xz*
+ cp *$1*.pkg.tar.xz $REPODIR/
+ [ "$SIGN" == "Y" ] && cp *$1*.pkg.tar.xz.sig $REPODIR
+ 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
+ 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
+ echo 1 > $REPODIR/.waitlist.lck
+ tail -n +2 $REPODIR/.waitlist > $REPODIR/.waitlist.tmp
+ cat $REPODIR/.waitlist.tmp > $REPODIR/.waitlist
+ rm $REPODIR/.waitlist.tmp
+ 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
@@ -87,12 +111,14 @@
if [ $UPDATE == "Y" ]; then
sudo pacman -Syu --noconfirm
fi
+
#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
+ build_pkg $(echo $d | rev | cut -d'/' -f1 | rev) $1 > /dev/null &
done
+ wait
return 0
}
@@ -120,6 +146,10 @@
#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
@@ -130,7 +160,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
@@ -138,7 +168,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"
@@ -159,6 +189,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;;
@@ -166,10 +206,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
- printf "Build for $(date)\nErrors found in $ERRORS\nPlease address these soon" | sendmail $EMAIL
+ send_email $ERRORS
fi
else
echo "All packages built successfully"
--
Gitblit v1.9.3