From 644280c8d9e4245f235a5f844809d3fc79ab3155 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sun, 08 Feb 2026 00:22:16 +0000
Subject: [PATCH] Skip trying to build packages in repos
---
main.sh | 117 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 85 insertions(+), 32 deletions(-)
diff --git a/main.sh b/main.sh
index c170e1c..9ef66d3 100755
--- a/main.sh
+++ b/main.sh
@@ -46,27 +46,13 @@
#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
- #make and force rebuild if is git package
- # Mictosoft fonts have problems with checksums and need a seperate argument
- if [[ "$1" == "ttf-ms-win10" ||
- "$1" == "ttf-office-2007-fonts" ||
- "$1" == "ttf-ms-win8" ||
- "$1" == "ttf-win7-fonts" ]]; then
- makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) --skipchecksums 2>&1
- else
- makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) 2>&1
- fi
- if [[ $? != 0 && $? != 13 ]]; then
- #Register error
- echo $1 >> $ERRORFILE
- return 1
- fi
-
#Remove old packages from build directory
source PKGBUILD
srcdir="$(pwd)/src"
@@ -77,6 +63,31 @@
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" ||
+ "$1" == "ttf-office-2007-fonts" ||
+ "$1" == "ttf-ms-win8" ||
+ "$1" == "ttf-win7-fonts" ]]; then
+ makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) --skipchecksums 2>&1
+ elif [[ "$1" == "icu"* ]]; then
+ echo ***1
+ pause
+ LC_ALL=C makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) 2>&1
+ else
+ 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
+ fi
+
#Get build artifact names from PKGBUILD and build artifacts
#Remove duplicates from the list
pkgs=()
@@ -99,12 +110,16 @@
#Move package to repodir and add to repo db
#Dont change the database if rebuilt the same package at same release and version
- flag=0
- for i in ${pkgs[@]}; do
- if [[ ! -f $REPODIR/$i ]]; then
- flag=1
- fi
- done
+ if [ -z $2 ]; then
+ flag=0
+ for i in ${pkgs[@]}; do
+ if [[ ! -f $REPODIR/$i ]]; then
+ flag=1
+ fi
+ done
+ else
+ flag=1
+ fi
if [[ $flag == 1 ]]; then
rm -f $REPODIR/*$1*.tar.*
for i in ${pkgs[@]}; do
@@ -202,7 +217,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
@@ -283,7 +298,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
}
@@ -336,14 +351,45 @@
return 0
}
+function remake-repo {
+ cd $REPODIR
+ rm -f $REPONAME.db.*
+ pkgs="$(find . -name '*.pkg.*' -not -name '*.sig')"
+ repo-add $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.$([ -n "$COMPRESSION" ] || echo $COMPRESSION && echo zst) $pkgs
+}
+
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
+# 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" \
+ -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: $@"
+ )
+ fi
+ return $?
}
case $1 in
@@ -357,14 +403,21 @@
remove ${@:2};;
"check")
check;;
+ "remake")
+ remake-repo;;
+ "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"
echo -e "\033[0;32mbuild-all [-f]\033[0m - build all packages in \$BUILDDIR, \"-f\" force builds whole repository"
+ echo -e "\033[-;32mremake\033[0m - Recreate repo"
esac
# Error reporting, send email only for build-all as assuming an batch job for that
@@ -372,7 +425,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