From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 877FD15802F for ; Sun, 5 Mar 2023 22:43:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A182E08A2; Sun, 5 Mar 2023 22:43:18 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80F4BE08A2 for ; Sun, 5 Mar 2023 22:43:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 717B33412D2 for ; Sun, 5 Mar 2023 22:43:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE75B88F for ; Sun, 5 Mar 2023 22:43:15 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1678055897.fe7ecde00f87122a0f05ba4ff88d24f66768f3b1.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto X-VCS-Directories: tools/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: fe7ecde00f87122a0f05ba4ff88d24f66768f3b1 X-VCS-Branch: master Date: Sun, 5 Mar 2023 22:43:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4deceb1a-a795-475c-ab0c-44a57ff7e99a X-Archives-Hash: e98e4e56d4c24bd34fc8dfc804a444ed commit: fe7ecde00f87122a0f05ba4ff88d24f66768f3b1 Author: Nic Boet boet cc> AuthorDate: Sun Mar 5 22:38:17 2023 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Mar 5 22:38:17 2023 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fe7ecde0 Do not source catalyst.conf as it's not bash syntax * non-bash formatted lines are executed; results in several "command not found" errors * instead, parse the file for the specific var [this still leaves the doublequotes " around the value- dilfridge] Signed-off-by: Nic Boet boet.cc> Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/catalyst-auto b/tools/catalyst-auto index 7c298699..e84d3594 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -119,8 +119,8 @@ post_build() { catalyst_var() { # Extract a setting from the catalyst.conf. - local var=$1 - (. "${CATALYST_CONFIG}"; echo "${!var}") + local var=$(grep --color=never -Po "^${1}\s*=\s*\K.*" "${CATALYST_CONFIG}" || true) + [[ -z ${var} ]] || echo "${var}" } trigger_post_build() {