[devtools,v2] makerepropkg: correctly reproduce a pkgfile with any compression type

Message ID 20191227174141.3018-1-eschwartz@archlinux.org
State Accepted
Headers show
Series
  • [devtools,v2] makerepropkg: correctly reproduce a pkgfile with any compression type
Related show

Commit Message

Eli Schwartz via arch-projects Dec. 27, 2019, 5:41 p.m. UTC
We don't want the default PKGEXT in the current version of devtools, we
want the PKGEXT we *know* the input file used.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---

v2: use one less line when defining PKGEXT, as per anthraxx review

 makerepropkg.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch

diff --git a/makerepropkg.in b/makerepropkg.in
index 40806cb..121456c 100755
--- a/makerepropkg.in
+++ b/makerepropkg.in
@@ -137,6 +137,7 @@  parse_buildinfo < <(bsdtar -xOqf "${pkgfile}" .BUILDINFO)
 export SOURCE_DATE_EPOCH="${buildinfo[builddate]}"
 PACKAGER="${buildinfo[packager]}"
 BUILDDIR="${buildinfo[builddir]}"
+PKGEXT=${pkgfile#${pkgfile%.pkg.tar*}}
 
 # nuke and restore reproducible testenv
 for copy in "${buildroot}"/*/; do
@@ -160,7 +161,7 @@  makechrootpkg -r "${buildroot}" -l "${chroot}" -- --packagelist || exit 1
 
 # set detected makepkg.conf options
 {
-    for var in PACKAGER BUILDDIR; do
+    for var in PACKAGER BUILDDIR PKGEXT; do
         printf '%s=%s\n' "${var}" "${!var@Q}"
     done
     printf 'OPTIONS=(%s)\n' "${buildopts[*]@Q}"