Merge 7ca488cb3d into e22229b5b1

.gitignore

@@ -1,27 +1 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
+/cmd/gost/gost
-*.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/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"
@@ -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)
 	}
 }