From 632f667417da4ab8fd80e04aadece60f80cc93dd Mon Sep 17 00:00:00 2001 From: jake Date: Wed, 27 May 2026 14:24:24 -0400 Subject: [PATCH] adjusting for version input --- install.sh | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/install.sh b/install.sh index 6414172..d51f453 100755 --- a/install.sh +++ b/install.sh @@ -32,24 +32,22 @@ function fixVersion { } #start script -echo "Starting Golang install" - -#validate version and architecture echo "Parsing go version" -#looking for go version in go.mod file, only checking up to minor version ignoring patch value to allow for stable versions -# -P uses perl syntax -DL_VERSION_RAW="$(grep "^go [0-9]+.[0-9]+" go.mod -P)" -if [[ -z "$DL_VERSION_RAW" ]]; then - #no go.mod file found - DL_VERSION_RAW=$GO_INSTALL_VERSION - #no version input set either - if [[ "$DL_VERSION_RAW" == "." ]]; then - echo "FATAL: No Go version found, set version input if no go.mod file is present" - exit 1 +#check install version field first +if [[ -z $GO_INSTALL_VERSION ]]; then + # -P uses perl syntax + DL_VERSION_RAW="$(grep "^go [0-9]+.[0-9]+" go.mod -P)" + if [[ -z "$DL_VERSION_RAW" ]]; then + echo "FATAL: No Go version found, set version input if no go.mod file is present" + exit 1 + else + fixVersion fi else - fixVersion + DL_VERSION_RAW="$GO_INSTALL_VERSION" fi + + echo "Found go version: ${DL_VERSION_RAW}" DL_ARCH=$GO_INSTALL_ARCH