diff --git a/Makefile b/Makefile index 5931953..2aa0f24 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ OUTPUT_DIR = ./builds GIT_COMMIT = `git rev-parse HEAD | cut -c1-7` -VERSION = 2.1.0alpha2 +VERSION = 2.1.0 BUILD_OPTIONS = -ldflags "-X main.Version=$(VERSION) -X main.CommitID=$(GIT_COMMIT)" gotty: main.go server/*.go webtty/*.go backend/*.go Makefile asset @@ -80,7 +80,7 @@ test: if [ `go fmt $(go list ./... | grep -v /vendor/) | wc -l` -gt 0 ]; then echo "go fmt error"; exit 1; fi cross_compile: - GOARM=5 gox -os="darwin linux freebsd netbsd openbsd solaris" -arch="386 amd64 arm" -osarch="!darwin/arm" -output "${OUTPUT_DIR}/pkg/{{.OS}}_{{.Arch}}/{{.Dir}}" + GOARM=5 gox -os="darwin linux freebsd netbsd openbsd solaris" -arch="386 amd64 arm" -osarch="!darwin/386" -osarch="!darwin/arm" -output "${OUTPUT_DIR}/pkg/{{.OS}}_{{.Arch}}/{{.Dir}}" targz: mkdir -p ${OUTPUT_DIR}/dist @@ -95,4 +95,4 @@ release: ghr -draft -prerelease ${VERSION} ${OUTPUT_DIR}/dist # -c ${GIT_COMMIT} --delete --prerelease -u sorenisanerd -r gotty ${VERSION} clean: - rm -fr gotty builds bindata server/asset.go + rm -fr gotty builds bindata server/asset.go js/dist diff --git a/resources/index.html b/resources/index.html index 9f6331e..be2558e 100644 --- a/resources/index.html +++ b/resources/index.html @@ -12,6 +12,6 @@
- +