From 3d918611a7da82247377abf1f12300387ce33c40 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Mon, 30 Nov 2020 12:26:22 +0000
Subject: [PATCH] Removed testing comments and unused spaces. added todo
---
main.sh | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/main.sh b/main.sh
index dd7c9be..f2a4f4a 100755
--- a/main.sh
+++ b/main.sh
@@ -51,9 +51,6 @@
return 2
fi
- #remove old versions before build
-# rm -f *$1*.tar.*
-
#make and force rebuild if is git package
# Mictosoft fonts have problems with checksums and need a seperate argument
if [[ "$1" == "ttf-ms-win10" ||
@@ -70,12 +67,19 @@
return 1
fi
- #Get build artifact names from PKGBUILD and build artifacts
- #Remove duplicates from the list
+ #Remove old packages from build directory
source PKGBUILD
srcdir="$(pwd)/src"
- ver=$(pkgver)
+ 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
+
+ #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")
@@ -107,7 +111,7 @@
cp $i $REPODIR/
[[ "$SIGN" == "Y" ]] && cp $i.sig $REPODIR/
done
- else
+ else
return;
fi
@@ -125,9 +129,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
@@ -197,6 +199,7 @@
#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
@@ -205,21 +208,35 @@
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; 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; 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
@@ -264,6 +281,7 @@
rm -f $TMPFILE
}
+#Check helper function
function check_pkg {
if [[ -z "$(curl -sI "https://aur.archlinux.org/packages/$2" | head -n1 | grep 200)" ]]; then
echo "$2" >> $1
--
Gitblit v1.9.3