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 | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/main.sh b/main.sh
index 37cf6be..9bbdb16 100755
--- a/main.sh
+++ b/main.sh
@@ -46,6 +46,8 @@
#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
@@ -202,7 +204,7 @@
local i j k
for i in $@; do
cd $BUILDDIR
- if [[ -z $(git ls-remote https://aur.archlinux.org/$i.git) ]]; then
+ if [ ! -d $i ] && [[ -z $(git ls-remote https://aur.archlinux.org/$i.git) ]]; then
echo "Not a package: $i"
exit 2
fi
@@ -337,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
@@ -357,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"
@@ -372,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