From 9e5affc4b5def98e5e959d870168831fb1bc1a30 Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Mon, 30 Nov 2020 12:19:41 +0000 Subject: [PATCH] Altered wording to be more updated --- main.sh | 54 ++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 40 insertions(+), 14 deletions(-) diff --git a/main.sh b/main.sh index 2974e8f..76e3f63 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 [[ -n "$(git pull | grep 'Already up to date.')" && -z "$(grep 'pkgver[[:space:]]() {' 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 @@ -195,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 @@ -203,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 -- Gitblit v1.9.3