From 2660254426f4465ae7a756a9e6651d6ba679a138 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sun, 29 Nov 2020 11:49:44 +0000
Subject: [PATCH] fixed version matching
---
main.sh | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/main.sh b/main.sh
index 58d3292..dd7c9be 100755
--- a/main.sh
+++ b/main.sh
@@ -52,7 +52,7 @@
fi
#remove old versions before build
- rm -f *$1*.tar.*
+# rm -f *$1*.tar.*
#make and force rebuild if is git package
# Mictosoft fonts have problems with checksums and need a seperate argument
@@ -64,7 +64,7 @@
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
@@ -73,7 +73,9 @@
#Get build artifact names from PKGBUILD and build artifacts
#Remove duplicates from the list
source PKGBUILD
- pkgs=()
+ srcdir="$(pwd)/src"
+ ver=$(pkgver)
+ find . -mindepth 1 -maxdepth 1 -type f \( -name "*.pkg.tar.*" -o -name "*.src.tar.*" \) -not -name "*$ver-$pkgrel*" -delete
ipkgs=()
for i in ${pkgname[@]}; do
#pkgs+=("$i-$pkgver-$pkgrel")
--
Gitblit v1.9.3