diff options
| author | Stefan Bethke <stb@lassitu.de> | 2020-03-25 23:21:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 00:21:33 +0200 |
| commit | e72c5cb02a235d79d6dd4fd96a8da85838ce7d9f (patch) | |
| tree | b1d8d7656e421b96d4fee7e65b8bda7b1d68e86e /Makefile | |
| parent | ad6f2323b77f048c2d689b22a0610ba33723bec6 (diff) | |
| download | gitea-e72c5cb02a235d79d6dd4fd96a8da85838ce7d9f.tar.gz gitea-e72c5cb02a235d79d6dd4fd96a8da85838ce7d9f.zip | |
Simplify grep regexp to be more compatible (#10765)
* Simplify grep regexp to be more compatible
The new expression also works with the BSD implementation of grep. Also,
I believe the expression did not work consistently for all possible
version numers, for example a two digit patch version would not have
been matched.
* Fix quote
* Allow for two and three part version numbers
* Select one, two and three part version numbers, reject amd64
* Also allow one to three parts for node version
* Use JS code to print node verion in correct format
* Avoid grep altogether
* Handle go1.14beta1 as well.
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -148,7 +148,7 @@ help: .PHONY: go-check go-check: - $(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell go version | grep -Eo '[0-9]+\.?[0-9]+?\.?[0-9]?[[:space:]]' | tr '.' ' ');)) + $(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell go version | grep -Eo '[0-9]+\.[0-9.]+' | tr '.' ' ');)) @if [ "$(GO_VERSION)" -lt "$(MIN_GO_VERSION)" ]; then \ echo "Gitea requires Go 1.12 or greater to build. You can get it at https://golang.org/dl/"; \ exit 1; \ @@ -163,7 +163,7 @@ git-check: .PHONY: node-check node-check: - $(eval NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell node -v | grep -Eo '[0-9]+\.?[0-9]+?\.?[0-9]?' | tr '.' ' ');)) + $(eval NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell node -v | cut -c2- | tr '.' ' ');)) $(eval NPM_MISSING := $(shell hash npm > /dev/null 2>&1 || echo 1)) @if [ "$(NODE_VERSION)" -lt "$(MIN_NODE_VERSION)" -o "$(NPM_MISSING)" = "1" ]; then \ echo "Gitea requires Node.js 10 or greater and npm to build. You can get it at https://nodejs.org/en/download/"; \ |