From ef4b3350263e0a903d7712e35732ef2013311f31 Mon Sep 17 00:00:00 2001
From: Chizi123 <build@jsrv.com>
Date: Mon, 19 Oct 2020 03:21:27 +0000
Subject: [PATCH] name only pkg and src tarballs
---
main.sh | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/main.sh b/main.sh
index 37d4ad7..4b66d2c 100755
--- a/main.sh
+++ b/main.sh
@@ -71,7 +71,7 @@
pkgs=()
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/^\.\///')")
+ pkgs+=("$(find . -mindepth 1 -maxdepth 1 -type f \( -name "$1*.pkg.tar.*" -o -name "$1*.src.tar.*" \) -not -name "*.sig" | sed 's/^\.\///')")
done
#Move package to repodir and add to repo db
@@ -205,13 +205,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.10.0