From 6bd4dea68c92c5ea1f71570d4a388a3cafb30332 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Thu, 19 Aug 2021 23:50:37 +0000
Subject: [PATCH] ssl optional but will try
---
main.sh | 75 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/main.sh b/main.sh
index 58d3292..d6dfa5c 100755
--- a/main.sh
+++ b/main.sh
@@ -46,13 +46,22 @@
#Build latest version of a package
# Usage: build_pkg [package name] [-f force]
function build_pkg {
+ #first need to reset repo, revert any changes so update can happen
+ git reset --hard
#check if PKGBUILD has updated, don't rebuild if hasn't changed
if [[ -n $(git pull | grep 'Already up to date.') && -z $(grep 'pkgver() {' PKGBUILD) && -z "$2" ]]; then
return 2
fi
- #remove old versions before build
- rm -f *$1*.tar.*
+ #Remove old packages from build directory
+ source PKGBUILD
+ srcdir="$(pwd)/src"
+ if grep -q 'pkgver() {' PKGBUILD; then
+ ver=$(pkgver)
+ else
+ ver=$pkgver
+ fi
+ find . -mindepth 1 -maxdepth 1 -type f \( -name "*.pkg.tar.*" -o -name "*.src.tar.*" \) -not -name "*$ver-$pkgrel*" -delete
#make and force rebuild if is git package
# Mictosoft fonts have problems with checksums and need a seperate argument
@@ -64,7 +73,7 @@
else
makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) 2>&1
fi
- if [[ $? != 0 ]]; then
+ if [[ $? != 0 && $? != 13 ]]; then
#Register error
echo $1 >> $ERRORFILE
return 1
@@ -72,7 +81,6 @@
#Get build artifact names from PKGBUILD and build artifacts
#Remove duplicates from the list
- source PKGBUILD
pkgs=()
ipkgs=()
for i in ${pkgname[@]}; do
@@ -105,7 +113,7 @@
cp $i $REPODIR/
[[ "$SIGN" == "Y" ]] && cp $i.sig $REPODIR/
done
- else
+ else
return;
fi
@@ -123,9 +131,7 @@
while true; do
# Wait until package is at the top of the queue and add to db
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
+ repo-add $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.$([ -n "$COMPRESSION" ] || echo $COMPRESSION && echo zst) ${pkgs[@]}
while true; do
if [[ $(cat $WAITLIST_LCK) == 1 ]]; then
sleep 1
@@ -195,29 +201,44 @@
#Adding build dependencies is
# Usage: add [package name]
function add {
+ local i j k
for i in $@; do
cd $BUILDDIR
- if [[ -z $(git ls-remote https://aur.archlinux.org/$i.git) ]]; then
- echo "Not a package"
+ if [ ! -d $i ] && [[ -z $(git ls-remote https://aur.archlinux.org/$i.git) ]]; then
+ echo "Not a package: $i"
exit 2
fi
git clone https://aur.archlinux.org/$i.git
cd $i
+ unset depends
+ unset makedepends
+ local makedeps
+ source PKGBUILD
- #check for all build dependencies
- for i in ${makedepends[@]}; do
- if pacman -Si $i; then
- makedepends=${makedepends[@]/$delete}
+ #Check for all build dependencies
+ for j in ${makedepends[@]}; do
+ k=$(echo $j | sed 's/[>]=.*//g')
+ if ! (pacman -Si $k || pacman -Qi $k); then
+ makedeps+=($k)
fi &>/dev/null
done
- for i in ${makedepends[@]}; do
- add $i
+ for j in ${depends[@]}; do
+ k=$(echo $j | sed 's/[>]=.*//g')
+ if ! (pacman -Si $k || pacman -Qi $k); then
+ makedeps+=($k)
+ fi &>/dev/null
done
- if [[ -n "${makedepends[@]}" ]]; then
+
+ #Add dependencies and update so overall build can work
+ for j in ${makedeps[@]}; do
+ add $j
+ done
+ if [[ -n "${makedeps[@]}" ]]; then
sudo pacman -Sy
fi
#Actually build wanted package
+ cd $BUILDDIR/$i
build_pkg $i -f
done
return 0
@@ -262,6 +283,7 @@
rm -f $TMPFILE
}
+#Check helper function
function check_pkg {
if [[ -z "$(curl -sI "https://aur.archlinux.org/packages/$2" | head -n1 | grep 200)" ]]; then
echo "$2" >> $1
@@ -317,13 +339,18 @@
}
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: $@"
- ) | sendmail -t
+ curl -s --url "smtp://$EMAIL_HOST" --ssl \
+ --mail-from "$FROM_EMAIL" \
+ --mail-rcpt "$TO_EMAIL" \
+ --user "$EMAIL_USER" \
+ -T <(
+ echo "From: $FROM_EMAIL"
+ echo "To: $TO_EMAIL"
+ echo "Subject: Build errors"
+ echo ""
+ echo "There were build errors for the build of $REPONAME at $(date), please address them soon."
+ echo "The errors were: $@"
+ )
}
case $1 in
--
Gitblit v1.10.0