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 | 79 ++++++++++++++++++++++++--------------- 1 files changed, 49 insertions(+), 30 deletions(-) diff --git a/main.sh b/main.sh index 5a491fa..f2a4f4a 100755 --- a/main.sh +++ b/main.sh @@ -47,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 @@ -60,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 >> $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 @@ -80,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,18 +111,8 @@ cp $i $REPODIR/ [[ "$SIGN" == "Y" ]] && cp $i.sig $REPODIR/ done - else + else 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 @@ -123,15 +129,13 @@ 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 else # Remove self from top of queue - echo 1 > $WAITLST_LCK + echo 1 > $WAITLIST_LCK TEMP=$(mktemp) tail -n +2 $WAITLIST > $TEMP cp $TEMP $WAITLIST @@ -195,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 @@ -203,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 @@ -252,7 +271,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)" & @@ -263,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