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 | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/main.sh b/main.sh
index f6127da..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
@@ -81,11 +81,10 @@
#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
+ if [[ ! -f $REPODIR/$i ]]; then
flag=1
fi
done
- flag=1
if [[ $flag == 1 ]]; then
rm -f $REPODIR/*$1*.tar.*
for i in ${pkgs[@]}; do
@@ -99,6 +98,11 @@
# 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
--
Gitblit v1.10.0