From: Jakub Ružička <jakub.ruzicka@nic.cz>
Date: Tue, 23 May 2023 11:42:28 +0000 (+0200)
Subject: scripts: improve make-archive.sh script
X-Git-Tag: v6.0.1^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=333b8f404b8e9716513558a0787d7b50d26afde0;p=thirdparty%2Fknot-resolver.git

scripts: improve make-archive.sh script

Copy resulting tarball into pkg/archives/dev and delete build_dist/ dir
to keep working copy clean.
---

diff --git a/scripts/make-archive.sh b/scripts/make-archive.sh
index 827036747..b9d00aa4a 100755
--- a/scripts/make-archive.sh
+++ b/scripts/make-archive.sh
@@ -33,6 +33,14 @@ rm -rf build_dist ||:
 meson build_dist
 ninja -C build_dist dist
 
-# print path to generated tarball
-set +o xtrace
-find "${PWD}/build_dist/meson-dist/" -name "knot-resolver-*.tar.xz"
+# copy tarball to apkg path
+DIST_ARCHIVE=$(find "build_dist/meson-dist/" -name "knot-resolver-*.tar.xz")
+APKG_ARCHIVE="pkg/archives/dev/$(basename $DIST_ARCHIVE)"
+mkdir -p pkg/archives/dev
+cp "$DIST_ARCHIVE" "$APKG_ARCHIVE"
+
+# remove build directory
+rm -rf build_dist ||:
+
+# print path to generated tarball as expected by apkg
+echo "$APKG_ARCHIVE"