From 095fd9d705e7aca78efda1b6510d9e5f83b843af Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sat, 18 Sep 2021 13:02:13 +0000
Subject: [PATCH] test-email returns curl return code
---
main.sh | 76 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 35 deletions(-)
diff --git a/main.sh b/main.sh
index 76e3f63..9bbdb16 100755
--- a/main.sh
+++ b/main.sh
@@ -46,11 +46,23 @@
#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 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
if [[ "$1" == "ttf-ms-win10" ||
@@ -67,16 +79,6 @@
return 1
fi
- #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
-
#Get build artifact names from PKGBUILD and build artifacts
#Remove duplicates from the list
pkgs=()
@@ -111,7 +113,7 @@
cp $i $REPODIR/
[[ "$SIGN" == "Y" ]] && cp $i.sig $REPODIR/
done
- else
+ else
return;
fi
@@ -129,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
@@ -201,13 +201,11 @@
#Adding build dependencies is
# Usage: add [package name]
function add {
- echo @: $@
-# read
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
@@ -217,31 +215,28 @@
local makedeps
source PKGBUILD
- #check for all build dependencies
+ #Check for all build dependencies
for j in ${makedepends[@]}; do
k=$(echo $j | sed 's/[>]=.*//g')
- if ! pacman -Si $k; then
+ if ! (pacman -Si $k || pacman -Qi $k); then
makedeps+=($k)
fi &>/dev/null
done
for j in ${depends[@]}; do
k=$(echo $j | sed 's/[>]=.*//g')
- if ! pacman -Si $k; then
+ if ! (pacman -Si $k || pacman -Qi $k); then
makedeps+=($k)
fi &>/dev/null
done
- echo $i: ${makedeps[@]}
-# read
+
+ #Add dependencies and update so overall build can work
for j in ${makedeps[@]}; do
add $j
-# read
done
- echo $i: ${makedeps[@]}
-# read
if [[ -n "${makedeps[@]}" ]]; then
sudo pacman -Sy
fi
-#read
+
#Actually build wanted package
cd $BUILDDIR/$i
build_pkg $i -f
@@ -288,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
@@ -343,13 +339,19 @@
}
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: $@"
+ )
+ return $?
}
case $1 in
@@ -363,10 +365,14 @@
remove ${@:2};;
"check")
check;;
+ "test-mail")
+ send_email
+ exit $?;;
*)
echo -e "\033[0;31mInvalid usage\033[0m"
echo -e "Usage: $0 init|check|add|remove|build-all"
echo -e "\033[0;32minit\033[0m - initialise repository for use"
+ echo -e "\033[0;32mtest-mail\033[m - test email configuration by sending the default email without a message"
echo -e "\033[0;32mcheck\033[0m - check if packages have been moved into the official repositories or removed from the AUR"
echo -e "\033[0;32madd package ...\033[0m - add a package to \$BUILDDIR and repository, also used to rebuild failed packages"
echo -e "\033[0;32mremove -a | package ...\033[0m - remove package from \$BUILDDIR and repository, \"-a\" removes packages added to official repos"
@@ -378,7 +384,7 @@
if [[ -n $(cat $ERRORFILE) ]]; then
ERRORS=$(cat $ERRORFILE | tr '\n' ' ')
echo "Errors in packages: $ERRORS"
- if [[ "$EMAIL" != "" && "$1" == "build-all" ]]; then
+ if [[ "$TO_EMAIL" != "" && "$1" == "build-all" ]]; then
send_email $ERRORS
fi
else
--
Gitblit v1.10.0