From 370324f6e2f3ce7d250a1c3686918c08da1f8b06 Mon Sep 17 00:00:00 2001 From: Eric Lemanissier Date: Tue, 26 May 2020 16:51:08 +0000 Subject: [PATCH] QMimeDatabase/xml: use xmlstarlet instead of xml some distributions (eg Ubuntu) don't provide xml executable, but only xmlstarlet executable Change-Id: Icc801ded8d4ec1ec4d1dab93289a2365f8cd9cbd Pick-to: 5.15 Reviewed-by: Thiago Macieira --- src/corelib/mimetypes/mime/generate.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/mimetypes/mime/generate.pl b/src/corelib/mimetypes/mime/generate.pl index 0f87d61f8e..4c1cb5bd9a 100644 --- a/src/corelib/mimetypes/mime/generate.pl +++ b/src/corelib/mimetypes/mime/generate.pl @@ -67,9 +67,9 @@ if ($fname eq "--zstd") { # Check if xml (from xmlstarlet) is in $PATH my $cmd; -if (checkCommand("xml")) { +if (checkCommand("xmlstarlet")) { # Minify the data before compressing - $cmd = "xml sel -D -B -t -c / $fname"; + $cmd = "xmlstarlet sel -D -B -t -c / $fname"; $cmd .= "| $compress" if $compress; } elsif ($compress) { $cmd = "$compress < $fname"