From 735bae3e0d17676430c6484bb1fc482e0cfd87ca Mon Sep 17 00:00:00 2001
From: Chizi123 <build@jsrv.com>
Date: Thu, 15 Oct 2020 07:25:25 +0000
Subject: [PATCH] added compression option for packages and repos
---
vars-default.sh | 3 +++
main.sh | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/main.sh b/main.sh
index d0cb1fb..66cc216 100755
--- a/main.sh
+++ b/main.sh
@@ -48,7 +48,7 @@
fi
#remove old versions before build
- rm *$1*.pkg.tar.*
+ rm *$1*
#make and force rebuild if is git package
# Mictosoft fonts have problems with checksums and need a seperate argument
@@ -71,7 +71,7 @@
pkgs=()
for i in ${pkgname[@]}; do
#pkgs+=("$i-$pkgver-$pkgrel")
- pkgs+=("$(find . -mindepth 1 -maxdepth 1 -type f -name "$1*.pkg.tar.*" -not -name "*.sig" | sed 's/^\.\///')")
+ pkgs+=("$(find . -mindepth 1 -maxdepth 1 -type f -name "$1*.tar.*" -not -name "*.sig" | sed 's/^\.\///')")
done
#Move package to repodir and add to repo db
@@ -80,7 +80,7 @@
if [[ -f $REPODIR/$i ]]; then
pkgs=${pkgs[@]/$i}
else
- rm $REPODIR/*$1*.pkg.tar.*
+ rm $REPODIR/*$1*
cp $i $REPODIR/
[[ "$SIGN" == "Y" ]] && cp $i.sig $REPODIR/
fi
@@ -106,7 +106,7 @@
# 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.xz $REPODIR/$i
+ repo-add $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.$([ -n COMPRESSION ] || echo $COMPRESSION && echo zst) $REPODIR/$i
done
while true; do
if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then
diff --git a/vars-default.sh b/vars-default.sh
index f0e617b..22cd35c 100644
--- a/vars-default.sh
+++ b/vars-default.sh
@@ -1,6 +1,9 @@
REPODIR=/repo/x86_64
BUILDDIR=/repo/build
REPONAME=
+COMPRESSION=zst
+export PKGEXT='.pkg.tar.zst'
+export SRCEXT='.src.tar.bz2'
export PACKAGER="John Doe <jd@change.me>"
EMAIL=""
UPDATE=N
--
Gitblit v1.9.3