From 453485a187c3522a22e7ac00f08c3ce8d9594bc6 Mon Sep 17 00:00:00 2001 From: Son Bui Date: Fri, 11 Aug 2023 09:51:03 +0800 Subject: [PATCH 1/2] fix: Run make dev-env syntax error #10293 Signed-off-by: Son Bui --- build/dev-env.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/dev-env.sh b/build/dev-env.sh index 3d21b7e158..98386adb02 100755 --- a/build/dev-env.sh +++ b/build/dev-env.sh @@ -45,9 +45,11 @@ if ! command -v helm &> /dev/null; then exit 1 fi +function ver { printf "%03d%03d%03d%03d" $(echo "$1" | tr '.' ' '); } + HELM_VERSION=$(helm version 2>&1 | cut -f1 -d"," | grep -oE '[0-9]+\.[0-9]+\.[0-9]+') || true echo $HELM_VERSION -if [[ ${HELM_VERSION} -lt 3.10.0 ]]; then +if [[ $(ver $HELM_VERSION) -lt $(ver "3.10.0") ]]; then echo "Please upgrade helm to v3.10.0 or higher" exit 1 fi From e13675d59ff2afc64e8f141f3148e0f69005fdce Mon Sep 17 00:00:00 2001 From: Son Bui Date: Fri, 11 Aug 2023 20:24:32 +0800 Subject: [PATCH 2/2] fix: Run make dev-env value too great for base #10294 --- build/dev-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dev-env.sh b/build/dev-env.sh index 98386adb02..e7b4101a21 100755 --- a/build/dev-env.sh +++ b/build/dev-env.sh @@ -45,7 +45,7 @@ if ! command -v helm &> /dev/null; then exit 1 fi -function ver { printf "%03d%03d%03d%03d" $(echo "$1" | tr '.' ' '); } +function ver { printf "%d%03d%03d" $(echo "$1" | tr '.' ' '); } HELM_VERSION=$(helm version 2>&1 | cut -f1 -d"," | grep -oE '[0-9]+\.[0-9]+\.[0-9]+') || true echo $HELM_VERSION