From 19edd1d808eaf6583aff048756df5eea81c90b4e Mon Sep 17 00:00:00 2001 From: Septs Date: Thu, 10 Nov 2016 13:01:14 +0800 Subject: [PATCH 1/3] fix logic error --- cmd/gost/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/gost/main.go b/cmd/gost/main.go index 528d420..fb5c50f 100644 --- a/cmd/gost/main.go +++ b/cmd/gost/main.go @@ -42,12 +42,12 @@ func init() { if flag.NFlag() == 0 { flag.PrintDefaults() - return + os.Exit(0) } if printVersion { fmt.Fprintf(os.Stderr, "GOST %s (%s)\n", gost.Version, runtime.Version()) - return + os.Exit(0) } } From 2328bf54037f2b807ea94afc3945a64d72cd15d9 Mon Sep 17 00:00:00 2001 From: Septs Date: Thu, 10 Nov 2016 13:44:37 +0800 Subject: [PATCH 2/3] fix logic error --- cmd/gost/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/gost/main.go b/cmd/gost/main.go index fb5c50f..ddad4f7 100644 --- a/cmd/gost/main.go +++ b/cmd/gost/main.go @@ -1,11 +1,11 @@ package main import ( + "../.." "crypto/tls" "encoding/json" "flag" "fmt" - "github.com/ginuerzh/gost" "github.com/golang/glog" "golang.org/x/net/http2" "io/ioutil" From 7ca488cb3d98b48cb0fb5e65b1fb7533f916bbb1 Mon Sep 17 00:00:00 2001 From: Septs Date: Thu, 10 Nov 2016 14:49:13 +0800 Subject: [PATCH 3/3] ignore build binary --- .gitignore | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 7840d7e..aa52c06 100644 --- a/.gitignore +++ b/.gitignore @@ -1,27 +1 @@ -# Compiled Object files, Static and Dynamic libs (Shared Objects) -*.o -*.a -*.so - -# Folders -_obj -_test -release -debian - -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - -*.cgo1.go -*.cgo2.c -_cgo_defun.c -_cgo_gotypes.go -_cgo_export.* - -_testmain.go - -*.exe -*.test - -*.bak +/cmd/gost/gost \ No newline at end of file