From fc805ea5237516e48e908c6709899c639dc54bd6 Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Sun, 13 Nov 2022 10:17:46 +0000 Subject: [PATCH] initial cmake old version handling --- main.sh | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/main.sh b/main.sh index 9bbdb16..919f1fa 100755 --- a/main.sh +++ b/main.sh @@ -74,6 +74,11 @@ makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) 2>&1 fi if [[ $? != 0 && $? != 13 ]]; then + if [[ -n $(find . -iname "*cmake") && "$2" != "-s" ]]; then + find ./src -iname "*cmake*" -type f -delete + build_pkg "$1" -s + return $? + fi #Register error echo $1 >> $ERRORFILE return 1 @@ -285,7 +290,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,6 +344,23 @@ } function send_email { +# 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" \ @@ -351,6 +373,7 @@ echo "There were build errors for the build of $REPONAME at $(date), please address them soon." echo "The errors were: $@" ) + fi return $? } -- Gitblit v1.10.0