From 37434cd3591e2ad28e6468dd42fbdc9f01f50303 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Mon, 30 Nov 2020 11:57:28 +0000
Subject: [PATCH] fixed dependency adding
---
main.sh | 123 +++++++++++++++++++++++++---------------
1 files changed, 77 insertions(+), 46 deletions(-)
diff --git a/main.sh b/main.sh
index 6f4f791..76e3f63 100755
--- a/main.sh
+++ b/main.sh
@@ -4,6 +4,10 @@
source $(dirname "$(realpath $0)")/vars.sh
+ERRORFILE=$(mktemp)
+WAITLIST=$(mktemp)
+WAITLIST_LCK=$(mktemp)
+
#Helper for finding newest and oldest files
#Sourced from stack overflow
# Usage: newold_matching_file [n/o] [filename]
@@ -43,12 +47,9 @@
# Usage: build_pkg [package name] [-f force]
function build_pkg {
#check if PKGBUILD has updated, don't rebuild if hasn't changed
- if [[ ! -z $(git pull | grep "Already up to date.") && -z $(grep 'pkgver() {' PKGBUILD) && -z $2 ]]; then
+ if [[ -n $(git pull | grep 'Already up to date.') && -z $(grep 'pkgver() {' PKGBUILD) && -z "$2" ]]; then
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
@@ -56,19 +57,28 @@
"$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
+ 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 ]]; then
+ if [[ $? != 0 && $? != 13 ]]; then
#Register error
- echo $1 >> $REPODIR/.errors
+ echo $1 >> $ERRORFILE
return 1
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
+
#Get build artifact names from PKGBUILD and build artifacts
#Remove duplicates from the list
- source PKGBUILD
pkgs=()
ipkgs=()
for i in ${pkgname[@]}; do
@@ -76,6 +86,16 @@
ipkgs+=($(find . -mindepth 1 -maxdepth 1 -type f \( -name "$i*.pkg.tar.*" -o -name "$i*.src.tar.*" \) -not -name "*.sig" | sed 's/^\.\///'))
done
while read -r -d '' x; do pkgs+=("$x"); done < <(printf "%s\0" "${ipkgs[@]}" | sort -uz)
+
+ # Weird exceptions
+ if [[ "$1" == "zoom" ]]; then
+ rm zoom*_orig*
+ for i in ${pkgs[@]}; do
+ if [ -z "${i##*_orig*}" ]; then
+ pkgs=(${pkgs[@]/$i})
+ fi
+ done
+ fi
#Move package to repodir and add to repo db
#Dont change the database if rebuilt the same package at same release and version
@@ -95,55 +115,48 @@
return;
fi
- # Weird exceptions
- if [[ "$1" == "zoom" ]]; then
- rm zoom*_orig*.pkg.tar.xz
- for i in ${pkgs[@]}; do
- if [ -z "${i##*orig*}" ]; then
- pkgs=${pkgs[@]/$i}
- fi
- done
- fi
-
# Add package to waiting list to be added to repo db
while true; do
- if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then
+ if [[ $(cat $WAITLIST_LCK) == 1 ]]; then
sleep 1
else
- echo 1 > $REPODIR/.waitlist.lck
- echo $1 >> $REPODIR/.waitlist
- echo 0 > $REPODIR/.waitlist.lck
+ echo 1 > $WAITLIST_LCK
+ echo $1 >> $WAITLIST
+ echo 0 > $WAITLIST_LCK
break
fi
done
while true; do
# Wait until package is at the top of the queue and add to db
- if [[ "$(head -n1 $REPODIR/.waitlist)" == "$1" ]]; then
+ 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
while true; do
- if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then
+ if [[ $(cat $WAITLIST_LCK) == 1 ]]; then
sleep 1
else
# Remove self from top of queue
- echo 1 > $REPODIR/.waitlist.lck
- tail -n +2 $REPODIR/.waitlist > $REPODIR/.waitlist.tmp
- mv $REPODIR/.waitlist.tmp $REPODIR/.waitlist
- echo 0 > $REPODIR/.waitlist.lck
+ echo 1 > $WAITLIST_LCK
+ TEMP=$(mktemp)
+ tail -n +2 $WAITLIST > $TEMP
+ cp $TEMP $WAITLIST
+ rm $TEMP
+ unset TEMP
+ echo 0 > $WAITLIST_LCK
break
fi
done
break
else
- if [[ -z "$(grep $1 $REPODIR/.waitlist)" ]]; then
+ if [[ -z "$(grep $1 $WAITLIST)" ]]; then
# Not on waitlist for some reason, need to readd
- if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then
+ if [[ $(cat $WAITLIST_LCK) == 1 ]]; then
sleep 1
else
- echo 1 > $REPODIR/.waitlist.lck
- echo $1 >> $REPODIR/.waitlist
- echo 0 > $REPODIR/.waitlist.lck
+ echo 1 > $WAITLIST_LCK
+ echo $1 >> $WAITLIST
+ echo 0 > $WAITLIST_LCK
fi
fi
sleep 10
@@ -169,8 +182,6 @@
sudo pacman -Syu --noconfirm
fi
- #Remove waitlist and errors from old builds
- rm -f $REPODIR/{.waitlist,.errors}
#update every package currently stored
for d in $(find $BUILDDIR -maxdepth 1 -mindepth 1 -type d)
do
@@ -190,6 +201,9 @@
#Adding build dependencies is
# Usage: add [package name]
function add {
+ echo @: $@
+# read
+ local i j k
for i in $@; do
cd $BUILDDIR
if [[ -z $(git ls-remote https://aur.archlinux.org/$i.git) ]]; then
@@ -198,21 +212,38 @@
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}
+ 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
+ echo $i: ${makedeps[@]}
+# read
+ for j in ${makedeps[@]}; do
+ add $j
+# read
+ done
+ echo $i: ${makedeps[@]}
+# read
+ if [[ -n "${makedeps[@]}" ]]; then
sudo pacman -Sy
fi
-
+#read
#Actually build wanted package
+ cd $BUILDDIR/$i
build_pkg $i -f
done
return 0
@@ -247,7 +278,6 @@
rmlist="$rmlist $(comm -12 <(pacman -Slq $REPONAME | sort) <(pacman -Slq core | sort) | tr '\n' ' ')"
rmlist="$rmlist $(comm -12 <(pacman -Slq $REPONAME | sort) <(pacman -Slq extra | sort) | tr '\n' ' ')"
rmlist="$rmlist $(comm -12 <(pacman -Slq $REPONAME | sort) <(pacman -Slq community | sort) | tr '\n' ' ')"
- removed=()
TMPFILE=$(mktemp)
for i in $(find $BUILDDIR -mindepth 1 -maxdepth 1 -type d); do
check_pkg $TMPFILE "$(echo $i | rev | cut -d'/' -f1 | rev)" &
@@ -345,9 +375,8 @@
# Error reporting, send email only for build-all as assuming an batch job for that
if [[ $1 == "build-all" || $1 == "add" ]]; then
- if [[ -f $REPODIR/.errors ]]; then
- ERRORS=$(cat $REPODIR/.errors | tr '\n' ' ')
- rm $REPODIR/.errors
+ if [[ -n $(cat $ERRORFILE) ]]; then
+ ERRORS=$(cat $ERRORFILE | tr '\n' ' ')
echo "Errors in packages: $ERRORS"
if [[ "$EMAIL" != "" && "$1" == "build-all" ]]; then
send_email $ERRORS
@@ -356,3 +385,5 @@
echo "All packages built successfully"
fi
fi
+
+rm $ERRORFILE $WAITLIST $WAITLIST_LCK
--
Gitblit v1.9.3