From 743e88fd67c35759686ef8e81c26e5d0d6810419 Mon Sep 17 00:00:00 2001 From: Henry Williams Date: Tue, 11 Feb 2025 07:55:03 -0500 Subject: [PATCH] Update generate_config.sh version checking for wider compatibility (#6270) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update generate_config.sh version checking for wider compatibility fix: replace `grep -oP` with `grep -oE` for broader compatibility The `-P` option (Perl-compatible regex) is not supported in all versions of `grep`, particularly the default BSD `grep` on macOS. This change replaces `-P` with `-E` (extended regex), which is more widely available and ensures compatibility across different environments. Tested on macOS and Linux. * Update generate_config.sh to remove use of platform dependent grep Replaced version checking using free-form text. Instead, uses Docker’s built-in templating instead of parsing free-form text. This gives cross-platform consistency without dependency on particular versions of grep. --- generate_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate_config.sh b/generate_config.sh index e3faf7bb7..4a4236ed6 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -26,7 +26,7 @@ for bin in openssl curl docker git awk sha1sum grep cut; do done # Check Docker Version (need at least 24.X) -docker_version=$(docker -v | grep -oP '\d+\.\d+\.\d+' | head -n 1 | cut -d '.' -f 1) +docker_version=$(docker version --format '{{.Server.Version}}' | cut -d '.' -f 1) if [[ $docker_version -lt 24 ]]; then echo -e "\e[31mCannot find Docker with a Version higher or equals 24.0.0\e[0m"