From cb9a5bc74af0b1655dfb739c951fdade4d1f1191 Mon Sep 17 00:00:00 2001 From: pdancak Date: Mon, 23 Jun 2025 10:41:12 +0200 Subject: [PATCH] Resolves: RHEL-97437 --- hp-plugin.in | 4 ++-- hplip.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hp-plugin.in b/hp-plugin.in index 48ab3b9..542db7c 100644 --- a/hp-plugin.in +++ b/hp-plugin.in @@ -34,13 +34,13 @@ for link in ${PLUGIN_SOURCE} ${FALLBACK_SOURCE} do download ${link} - if test "x$(file --mime ~/.hplip/${PLUGIN_FILE} | grep 'text/x-shellscript')" = "xtext/x-shellscript" + if test "x$(file --mime ~/.hplip/${PLUGIN_FILE} | grep -o 'text/x-shellscript')" = "xtext/x-shellscript" then break fi done -if test "x$(file --mime ~/.hplip/${PLUGIN_FILE} | grep 'text/x-shellscript')" = "x" +if test "x$(file --mime ~/.hplip/${PLUGIN_FILE} | grep -o 'text/x-shellscript')" = "x" then @bindir@/echo "The downloaded file does not exist or is not a shell script - error during downloading, exiting..." exit 1 diff --git a/hplip.spec b/hplip.spec index 9cf2feb..c9f06ef 100644 --- a/hplip.spec +++ b/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.23.12 -Release: 8%{?dist} +Release: 9%{?dist} # most files (base/*, *, ui*/...) - GPL2+ # prnt/hpijs/ jpeg related files - IJG # prnt/* - BSD-3-Clause-HP - it is modified a little, asked here https://gitlab.com/fedora/legal/fedora-license-data/-/issues/267 @@ -962,6 +962,9 @@ find doc/images -type f -exec chmod 644 {} \; %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %changelog +- hp-plugin-download wrongly parsed file type + Resolves: RHEL-97437 + * Tue Oct 29 2024 Troy Dawson - 3.23.12-8 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018