From 4e1092be0ca7cc15ef2b4fff6fbac24439aa53cb Mon Sep 17 00:00:00 2001 From: shaoying Date: Wed, 21 Oct 2020 09:01:16 +0800 Subject: [PATCH] opt some --- Makefile | 5 ++--- src/main.go | 14 -------------- src/main.shy | 1 - 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 0738d3b2..4b9b6cbe 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,7 @@ export GOPROXY=https://goproxy.cn export GOPRIVATE=github.com -# export CGO_ENABLED=0 +export CGO_ENABLED=0 -meta_info = "-X main.Time=`date +"%Y-%m-%d_%H:%M:%S"` -X main.Version=`git describe --tags` -X main.HostName=`hostname` -X main.UserName=`whoami`" all: @echo && date - go build -ldflags $(meta_info) -v -o bin/ice.bin src/main.go && chmod u+x bin/ice.bin && ./bin/ice.sh restart + go build -v -o bin/ice.bin src/main.go && chmod u+x bin/ice.bin && ./bin/ice.sh restart diff --git a/src/main.go b/src/main.go index 9fcabde8..997f9970 100644 --- a/src/main.go +++ b/src/main.go @@ -36,18 +36,4 @@ import ( _ "github.com/shylinux/mysql-story/src/server" ) -var ( - Time string - Version string - HostName string - UserName string -) - -func init() { - ice.Info.Build.Time = Time - ice.Info.Build.Version = Version - ice.Info.Build.HostName = HostName - ice.Info.Build.UserName = UserName -} - func main() { print(ice.Run()) } diff --git a/src/main.shy b/src/main.shy index 076e82e3..b0012958 100644 --- a/src/main.shy +++ b/src/main.shy @@ -92,4 +92,3 @@ table ` 阿里 Amazon ` -source hi/hi.shy