Merge branch 'master' into dev

gondis · Feb 10, 2017 · fc13330 · fc13330
2 parents 72b9502 + f52b52d
commit fc13330
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ GoDoc at https://godoc.org/github.com/shadowsocks/go-shadowsocks2/
 ## Install
 
 ```sh
-go install github.com/shadowsocks/go-shadowsocks2
+go get github.com/shadowsocks/go-shadowsocks2
 ```
 
 

diff --git a/main.go b/main.go
@@ -42,7 +42,7 @@ func main() {
 	}
 
 	flag.BoolVar(&config.Verbose, "verbose", false, "verbose mode")
-	flag.StringVar(&flags.Cipher, "cipher", "", "cipher")
+	flag.StringVar(&flags.Cipher, "cipher", "aes-128-gcm-16", "available ciphers: "+strings.Join(listCipher(), " "))
 	flag.StringVar(&flags.Key, "key", "", "base64url-encoded key (derive from password if empty)")
 	flag.IntVar(&flags.Keygen, "keygen", 0, "generate a base64url-encoded random key of given length in byte")
 	flag.StringVar(&flags.Password, "password", "", "password")
@@ -68,15 +68,6 @@ func main() {
 		return
 	}
 
-	if flags.Cipher == "" {
-		ls := listCipher()
-		fmt.Fprintf(os.Stderr, "# available ciphers\n")
-		for _, each := range ls {
-			fmt.Fprintf(os.Stderr, "%s\n", each)
-		}
-		return
-	}
-
 	var key []byte
 	if flags.Key != "" {
 		k, err := base64.URLEncoding.DecodeString(flags.Key)
-Original file line number
+Diff line change
@@ Expand Up @@
     ## Install
     ```sh
-    go install github.com/shadowsocks/go-shadowsocks2
+    go get github.com/shadowsocks/go-shadowsocks2
     ```
@@ Expand Down @@