From ae3c9b666a74f98847bb28d5e683861494c4c880 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sun, 10 Apr 2022 00:44:49 +0000
Subject: [PATCH] Check AUR with GET request instead of HEAD
---
main.sh | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/main.sh b/main.sh
index 76217c9..fd93dd2 100755
--- a/main.sh
+++ b/main.sh
@@ -285,7 +285,7 @@
#Check helper function
function check_pkg {
- if [[ -z "$(curl -sI "https://aur.archlinux.org/packages/$2" | head -n1 | grep 200)" ]]; then
+ if [[ -z "$(curl -si "https://aur.archlinux.org/packages/$2" | head -n1 | grep 200)" ]]; then
echo "$2" >> $1
fi
}
@@ -339,7 +339,24 @@
}
function send_email {
- curl -s --url "smtp://$EMAIL_HOST" --ssl-reqd \
+# message=(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: $@"
+# )
+ if [ 1 ]; then
+ (
+ 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: $@"
+ ) | sendmail -t
+ else
+ curl -s --url "smtp://$EMAIL_HOST" --ssl \
--mail-from "$FROM_EMAIL" \
--mail-rcpt "$TO_EMAIL" \
--user "$EMAIL_USER" \
@@ -351,6 +368,8 @@
echo "There were build errors for the build of $REPONAME at $(date), please address them soon."
echo "The errors were: $@"
)
+ fi
+ return $?
}
case $1 in
@@ -364,10 +383,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"
@@ -379,7 +402,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