commit: fe7ecde00f87122a0f05ba4ff88d24f66768f3b1
Author: Nic Boet <nic <AT> boet <DOT> cc>
AuthorDate: Sun Mar 5 22:38:17 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> 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 <nic <AT> boet.cc>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> 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() {
