[vlc-commits] [Git][videolan/vlc][master] share: really sort files in the skins tarball

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
739f285e by Rémi Denis-Courmont at 2022-05-20T06:30:46+00:00
share: really sort files in the skins tarball

Looking through the tar command line help is brittle, and as a matter of
facts fails miserably with non-English locales.

Just feed a sorted list of files for tar to archive instead. This should
work regardless of the tar tool version in use.

Fixes Debian #990247.

- - - - -


1 changed file:

- share/Makefile.am


Changes:

=====================================
share/Makefile.am
=====================================
@@ -97,13 +97,11 @@ skins2_default_vlt_FILES = \
 skins2/default.vlt: $(skins2_default_vlt_FILES)
 	$(AM_V_at)mkdir -p skins2
 	$(AM_V_at)rm -f -- skins2/default.vlt.tmp
-	$(AM_V_GEN)tarsort= ; \
-	tar --help|grep -q sort=ORDER && tarsort=--sort=name ; \
-	GZIP=--no-name \
+	$(AM_V_GEN)GZIP=--no-name \
 	tar cvvzf skins2/default.vlt.tmp \
 		--format=ustar $$tarsort \
 		--owner=root --group=root --directory="$(srcdir)/skins2" \
-		default/
+		$$(cd "$(srcdir)/skins2" && find default/ -type f | LC_ALL=C sort)
 	$(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt
 
 #



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/739f285ed5290d49bfb28c1d71561dc4b798e711

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/739f285ed5290d49bfb28c1d71561dc4b798e711
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance