[X2Go-Commits] [buildscripts] 11/12: bin/sbuild-deb-package: also support orig.tar.xz files.

git-admin at x2go.org git-admin at x2go.org
Mon Mar 11 14:46:40 CET 2024


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 546b8f41a58dcf95daa0d9f2f8f700e9b1ff4f83
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Mar 10 18:09:12 2024 +0100

    bin/sbuild-deb-package: also support orig.tar.xz files.
---
 bin/sbuild-deb-package | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index f616f48..581679d 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -306,7 +306,7 @@ clear_pkgdist() {
 						rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.build
 						rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.buildinfo
 						rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.dsc
-						rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.tar.gz
+						rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.tar.{x,g}z
 						rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*.deb
 					}
 				done
@@ -345,7 +345,13 @@ build_packages() {
 				git clone --no-hardlinks --no-local "${PROJECT_DIR}" "${TEMP_DIR}/${PROJECT}/"
 				cd "${TEMP_DIR}/${PROJECT}"
 				git checkout "${CHECKOUT}" || git checkout 'master'
-				find "${PROJECT_DIR}/../" -maxdepth 0 -mindepth 0 -type f | grep -qs "${PROJECT}_"*.orig.tar.gz && cp -- "${PROJECT_DIR}/../${PROJECT}_"*.orig.tar.gz ..
+				find "${PROJECT_DIR}/../" -maxdepth '0' -mindepth '0' -type 'f' | while read -r -d '' line; do
+					case "$(basename "${file}")" in
+						("${PROJECT}_"*'.orig.tar.xz'|"${PROJECT}_"*'.orig.tar.gz')
+							cp -- "${file}" '..'
+							;;
+					esac
+				done
 				GITREV="$(gitrevno)"
 				typeset gitdate="$(gitdate)"
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git


More information about the x2go-commits mailing list