From 896dec8c411dad1d7b3bd6adf484d08519ea6331 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sat, 17 Jun 2023 23:54:43 +0000
Subject: [PATCH] Added command to remake repo if key changes or packages are missing
---
main.sh | 120 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 92 insertions(+), 28 deletions(-)
diff --git a/main.sh b/main.sh
index c460d78..41535c1 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" ||
@@ -62,19 +74,19 @@
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
- #Remove old packages from build directory
- source PKGBUILD
- srcdir="$(pwd)/src"
- ver=$(pkgver)
- 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=()
ipkgs=()
for i in ${pkgname[@]}; do
#pkgs+=("$i-$pkgver-$pkgrel")
@@ -106,7 +118,7 @@
cp $i $REPODIR/
[[ "$SIGN" == "Y" ]] && cp $i.sig $REPODIR/
done
- else
+ else
return;
fi
@@ -124,9 +136,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
@@ -196,29 +206,44 @@
#Adding build dependencies is
# Usage: add [package name]
function add {
+ 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
cd $i
+ unset depends
+ unset makedepends
+ local makedeps
+ source PKGBUILD
- #check for all build dependencies
- for i in ${makedepends[@]}; do
- if pacman -Si $i; then
- makedepends=${makedepends[@]/$delete}
+ #Check for all build dependencies
+ for j in ${makedepends[@]}; do
+ k=$(echo $j | sed 's/[>]=.*//g')
+ if ! (pacman -Si $k || pacman -Qi $k); then
+ makedeps+=($k)
fi &>/dev/null
done
- for i in ${makedepends[@]}; do
- add $i
+ for j in ${depends[@]}; do
+ k=$(echo $j | sed 's/[>]=.*//g')
+ if ! (pacman -Si $k || pacman -Qi $k); then
+ makedeps+=($k)
+ fi &>/dev/null
done
- if [[ -n "${makedepends[@]}" ]]; then
+
+ #Add dependencies and update so overall build can work
+ for j in ${makedeps[@]}; do
+ add $j
+ done
+ if [[ -n "${makedeps[@]}" ]]; then
sudo pacman -Sy
fi
#Actually build wanted package
+ cd $BUILDDIR/$i
build_pkg $i -f
done
return 0
@@ -263,8 +288,9 @@
rm -f $TMPFILE
}
+#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
}
@@ -317,14 +343,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
@@ -338,14 +395,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
@@ -353,7 +417,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