From 72214187c55f39965da48efa175d13d286e123dd Mon Sep 17 00:00:00 2001 From: Markus Greiner Date: Mon, 18 Aug 2025 11:42:54 +0200 Subject: [PATCH] maint(common): rename and move node-related script functions into node.inc.sh Consolidates the node-related script functions into node.inc.sh, as part of cleaning up the build scripts and making them easier to maintain into the future. In the earlier commite some changes were missing. Fixes: #14447 --- resources/docker-images/build.sh | 2 +- resources/docker-images/docker-build.inc.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/docker-images/build.sh b/resources/docker-images/build.sh index 07223787cd..af750137f4 100755 --- a/resources/docker-images/build.sh +++ b/resources/docker-images/build.sh @@ -9,7 +9,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" ################################ Main script ################################ . "${KEYMAN_ROOT}/resources/build/minimum-versions.inc.sh" -. "${KEYMAN_ROOT}/resources/build/utils.inc.sh" +. "${KEYMAN_ROOT}/resources/build/node.inc.sh" . "${KEYMAN_ROOT}/resources/docker-images/docker-build.inc.sh" builder_describe \ diff --git a/resources/docker-images/docker-build.inc.sh b/resources/docker-images/docker-build.inc.sh index 44c129ac20..b10701b73c 100644 --- a/resources/docker-images/docker-build.inc.sh +++ b/resources/docker-images/docker-build.inc.sh @@ -30,7 +30,7 @@ convert_parameters_to_args() { build_version= local required_node_version keyman_default_distro # shellcheck disable=SC2034 - required_node_version="$(_print_expected_node_version)" + required_node_version="$(_node_print_expected_version)" # shellcheck disable=SC2034 keyman_default_distro="ubuntu"