Skip to content

Commit b7dac53

Browse files
committed
ensure-go-installed.sh: make version number check more robust
...and fix a comment.
1 parent 927ceb7 commit b7dac53

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

script/ensure-go-installed.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ if [ -z "$ROOTDIR" ]; then
44
echo 1>&2 'ensure-go-installed.sh invoked without ROOTDIR set!'
55
fi
66

7-
# Is go installed, and at least 1.7?
7+
# Is go installed, and at least 1.9?
88
go_ok() {
9-
case "$(go version 2>/dev/null | sed -n 's/.*go\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/p' | head -n 1)" in
10-
""|0.*|1.[012345678])
11-
false ;;
12-
*)
13-
true ;;
14-
esac
9+
set -- $(go version 2>/dev/null |
10+
sed -n 's/.*go\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1 \2/p' |
11+
head -n 1)
12+
[ $# -eq 2 ] && [ "$1" -eq 1 ] && [ "$2" -ge 9 ]
1513
}
1614

1715
# If a local go is installed, use it.

0 commit comments

Comments
 (0)