From 1712b5d8134dd3273866f5428d9d203e014c7c3e Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Wed, 1 Mar 2023 12:20:37 -0800
Subject: [PATCH] Incorporate feedback

---
 make.sh | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/make.sh b/make.sh
index 7e5d3a61a..39364a619 100755
--- a/make.sh
+++ b/make.sh
@@ -1,19 +1,6 @@
 #!/bin/sh
 set -eu
 
-REQUIRED_GO_MINOR=$(sed -En 's/^go[[:space:]]+([[:digit:].]+)$/\1/p' go.mod)
-ACTUAL_GO_VERSION=$(go version | sed -n 's/^go version go\([0-9]*\.[0-9]*\.[0-9]*\)\(.*\)/\1/p')
-
-# We use 'case' instead of '[' to match values against complex patterns, because POSIX
-# does not guarantee that '[' supports advanced features like globs and regex.
-if case "$ACTUAL_GO_VERSION" in "$REQUIRED_GO_MINOR".*) false ;; *) true ;; esac then
-  red="\e[0;91m"
-  reset="\e[0m"
-
-  printf "${red}PROBLEM: You need go %s to build d2, but you have %s installed.${reset}\n" "$REQUIRED_GO_MINOR" "$ACTUAL_GO_VERSION"
-  exit 1
-fi
-
 if [ ! -e "$(dirname "$0")/ci/sub/.git" ]; then
   set -x
   git submodule update --init
@@ -23,4 +10,11 @@ fi
 PATH="$(cd -- "$(dirname "$0")" && pwd)/ci/sub/bin:$PATH"
 cd -- "$(dirname "$0")"
 
+GO_VERSION=$(sed -En 's/^go[[:space:]]+([[:digit:].]+)$/\1/p' go.mod)
+
+if ! $(go version | grep -qF "${GO_VERSION}"); then
+  printferr "You need go %s to build d2.\n" "$GO_VERSION"
+  exit 1
+fi
+
 _make "$@"