From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 29 Nov 2022 16:39:20 +0000 (+0000)
Subject: build: Fix collecting pre-requires from scriptlets
X-Git-Tag: 0.9.28~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1822d065ffdda8feac79e639289da2257b163bf;p=pakfire.git

build: Fix collecting pre-requires from scriptlets

--login is required to set the path correctly, and we now throw away any
errors from which.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/scripts/find-prerequires b/src/scripts/find-prerequires
index 355aa612b..be7d46730 100644
--- a/src/scripts/find-prerequires
+++ b/src/scripts/find-prerequires
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash --login
 ###############################################################################
 #                                                                             #
 # Pakfire - The IPFire package management system                              #
@@ -31,8 +31,6 @@ main() {
 		return 1
 	fi
 
-	cat "${scriptlet}" >&2
-
 	# We require a shell
 	echo "/bin/sh"
 
@@ -43,7 +41,7 @@ main() {
 				echo "${req}"
 				;;
 			*)
-				which "${req}"
+				which "${req}" 2>/dev/null
 				;;
 		esac
 	done < <(bash --rpm-requires < "${scriptlet}" | sed -e "s/^.*(//;s/)$//" | sort -u)