From 5f1f4fdfc7af9121ec367629eafddf93605dc5a4 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Wed, 20 Jan 2021 02:23:23 +0000
Subject: [PATCH] moved old package deletion to before build
---
main.sh | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/main.sh b/main.sh
index f2a4f4a..37cf6be 100755
--- a/main.sh
+++ b/main.sh
@@ -51,6 +51,16 @@
return 2
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
+
#make and force rebuild if is git package
# Mictosoft fonts have problems with checksums and need a seperate argument
if [[ "$1" == "ttf-ms-win10" ||
@@ -67,16 +77,6 @@
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
pkgs=()
@@ -203,7 +203,7 @@
for i in $@; do
cd $BUILDDIR
if [[ -z $(git ls-remote https://aur.archlinux.org/$i.git) ]]; then
- echo "Not a package"
+ echo "Not a package: $i"
exit 2
fi
git clone https://aur.archlinux.org/$i.git
@@ -216,13 +216,13 @@
#Check for all build dependencies
for j in ${makedepends[@]}; do
k=$(echo $j | sed 's/[>]=.*//g')
- if ! pacman -Si $k; then
+ if ! (pacman -Si $k || pacman -Qi $k); then
makedeps+=($k)
fi &>/dev/null
done
for j in ${depends[@]}; do
k=$(echo $j | sed 's/[>]=.*//g')
- if ! pacman -Si $k; then
+ if ! (pacman -Si $k || pacman -Qi $k); then
makedeps+=($k)
fi &>/dev/null
done
--
Gitblit v1.10.0