From 54a061e7c76a2ea4c69226d0b6f91290d75739ee Mon Sep 17 00:00:00 2001 From: cndoit18 Date: Thu, 20 Mar 2025 11:51:24 +0800 Subject: [PATCH] fix: handle optional 'go' prefix in parsed Go version strings Change-Id: I5bb718520b13ccc832e635e524c40cd5b34d6397 --- scripts/env/cd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/env/cd b/scripts/env/cd index ea1d1953..d872abe8 100644 --- a/scripts/env/cd +++ b/scripts/env/cd @@ -181,15 +181,15 @@ __gvmp_find_closest_dot_go_pkgset() { __gvmp_read_dot_go_version() { local filepath="${1}" local version="" - local regex='^(go([0-9]+(\.[0-9]+)*))$' + local regex='^((go)?([0-9]+(\.[0-9]+)*))$' while IFS=$'\n' read -r _line; do # skip comment lines [[ "${_line}" =~ \#.* ]] && continue - # looking for pattern "go1.2[.3]" + # looking for pattern "[go]1.2[.3]" if [[ "${_line}" =~ ${regex} ]]; then - version="${_line}" + version="go${_line#go}" break fi done <<< "$(cat "${filepath}")"