From fd479d133b20ce5e543948b66496aadfd09a3a6a Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Wed, 31 May 2017 15:35:10 +0800 Subject: [PATCH 1/2] fix: error from mktemp command in MacOS. --- .gitignore | 2 +- Makefile | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index d9e96b75dcf2b..339cc67b52b13 100644 --- a/.gitignore +++ b/.gitignore @@ -45,4 +45,4 @@ coverage.out /indexers /log /public/img/avatar -/integrations/gitea-integration \ No newline at end of file +/integrations/gitea-integration diff --git a/Makefile b/Makefile index 84d201e234b1c..b51ae6a20da7c 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,5 @@ DIST := dist IMPORT := code.gitea.io/gitea - -ifeq ($(OS), Windows_NT) - EXECUTABLE := gitea.exe -else - EXECUTABLE := gitea -endif - BINDATA := modules/{options,public,templates}/bindata.go STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less) JAVASCRIPTS := @@ -22,7 +15,13 @@ SOURCES ?= $(shell find . -name "*.go" -type f) TAGS ?= -TMPDIR := $(shell mktemp -d) +TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'tempdir') + +ifeq ($(OS), Windows_NT) + EXECUTABLE := gitea.exe +else + EXECUTABLE := gitea +endif ifneq ($(DRONE_TAG),) VERSION ?= $(subst v,,$(DRONE_TAG)) From edb683dee2e9d84d4d1f03182511385a773a3e54 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sun, 4 Jun 2017 13:12:37 +0800 Subject: [PATCH 2/2] [ci skip] udpate temp name. Signed-off-by: Bo-Yi Wu --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b51ae6a20da7c..6b0c0327a4603 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ SOURCES ?= $(shell find . -name "*.go" -type f) TAGS ?= -TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'tempdir') +TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'gitea-temp') ifeq ($(OS), Windows_NT) EXECUTABLE := gitea.exe