From dfed5fa5e727233ca02f5711c6b781623644f4af Mon Sep 17 00:00:00 2001 From: Chizi123 <build@jsrv.com> Date: Mon, 19 Oct 2020 08:32:11 +0000 Subject: [PATCH] work with all vc packages formatted to guidelines, remove zoom orig --- main.sh | 63 ++++++++++++++++++++++--------- 1 files changed, 45 insertions(+), 18 deletions(-) diff --git a/main.sh b/main.sh index 37d4ad7..f42697d 100755 --- a/main.sh +++ b/main.sh @@ -43,7 +43,7 @@ # 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 $(echo $1 | grep git) && -z $2 ]]; then + if [[ ! -z $(git pull | grep "Already up to date.") && -z $(grep 'pkgver() {' PKGBUILD) && -z $2 ]]; then return 2 fi @@ -66,29 +66,43 @@ return 1 fi - #Get build artifact names + #Get build artifact names from PKGBUILD and build artifacts + #Remove duplicates from the list source PKGBUILD pkgs=() + ipkgs=() for i in ${pkgname[@]}; do #pkgs+=("$i-$pkgver-$pkgrel") - pkgs+=("$(find . -mindepth 1 -maxdepth 1 -type f -name "$1*.tar.*" -not -name "*.sig" | sed 's/^\.\///')") + 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) #Move package to repodir and add to repo db #Dont change the database if rebuilt the same package at same release and version + flag=0 for i in ${pkgs[@]}; do - if [[ -f $REPODIR/$i ]]; then - pkgs=${pkgs[@]/$i} - else - rm -f $REPODIR/*$1*.tar.* - cp $i $REPODIR/ - [[ "$SIGN" == "Y" ]] && cp $i.sig $REPODIR/ + if [[ ! -f $REPODIR/$i ]]; then + flag=1 fi done + if [[ $flag == 1 ]]; then + rm -f $REPODIR/*$1*.tar.* + for i in ${pkgs[@]}; do + cp $i $REPODIR/ + [[ "$SIGN" == "Y" ]] && cp $i.sig $REPODIR/ + done + 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 @@ -105,9 +119,9 @@ while true; do # Wait until package is at the top of the queue and add to db if [[ "$(head -n1 $REPODIR/.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) $REPODIR/$i - done + # 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 sleep 1 @@ -205,13 +219,26 @@ } #Remove a package from the build list and repository -# Usage remove [package name] +#Usage of -a removes all packages moved to official repos +# Usage remove [-a|package name] function remove { - for i in $@; do - rm -rf $BUILDDIR/$i - repo-remove $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.$([ -n "$COMPRESSION" ] || echo $COMPRESSION && echo zst) $i - rm -f $REPODIR/*$i* - done + if [[ "$1" == "-a" ]]; then + rmlist="" + 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' ' ')" + for i in $rmlist; do + rm -rf $BUILDDIR/$i + repo-remove $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.$([ -n "$COMPRESSION" ] || echo $COMPRESSION && echo zst) $i + rm -f $REPODIR/*$i* + done + else + for i in $@; do + rm -rf $BUILDDIR/$i + repo-remove $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.$([ -n "$COMPRESSION" ] || echo $COMPRESSION && echo zst) $i + rm -f $REPODIR/*$i* + done + fi } #Check config and create build folders -- Gitblit v1.9.3