Lines 1-20
Link Here
|
1 |
--- Makefile.orig 2020-03-06 17:18:36.000000000 +0000 |
|
|
2 |
+++ Makefile 2020-03-18 20:56:00.588102000 +0000 |
3 |
@@ -123,7 +123,7 @@ |
4 |
|
5 |
.PHONY: go-check |
6 |
go-check: |
7 |
- $(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell go version | grep -Eo '[0-9]+\.?[0-9]+?\.?[0-9]?[[:space:]]' | tr '.' ' ');)) |
8 |
+ $(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell go version | grep -Eo 'go[0-9\.]+' | tr -d go | tr '.' ' ');)) |
9 |
@if [ "$(GO_VERSION)" -lt "001011000" ]; then \ |
10 |
echo "Gitea requires Go 1.11.0 or greater to build. You can get it at https://golang.org/dl/"; \ |
11 |
exit 1; \ |
12 |
@@ -138,7 +138,7 @@ |
13 |
|
14 |
.PHONY: node-check |
15 |
node-check: |
16 |
- $(eval NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell node -v | grep -Eo '[0-9]+\.?[0-9]+?\.?[0-9]?' | tr '.' ' ');)) |
17 |
+ $(eval NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell node -v | grep -Eo '[0-9]+\.?[0-9]+\.?[0-9]+' | tr '.' ' ');)) |
18 |
$(eval NPM_MISSING := $(shell hash npm > /dev/null 2>&1 || echo 1)) |
19 |
@if [ "$(NODE_VERSION)" -lt "010000000" -o "$(NPM_MISSING)" = "1" ]; then \ |
20 |
echo "Gitea requires Node.js 10.0.0 or greater and npm to build. You can get it at https://nodejs.org/en/download/"; \ |