Browse Source

all: format

fatedier 8 years ago
parent
commit
e8c830e5c8
2 changed files with 20 additions and 12 deletions
  1. 9 1
      src/frp/cmd/frpc/main.go
  2. 11 11
      src/frp/cmd/frps/main.go

+ 9 - 1
src/frp/cmd/frpc/main.go

@@ -36,7 +36,8 @@ var usage string = `frpc is the client of frp
 
 Usage: 
     frpc [-c config_file] [-L log_file] [--log-level=<log_level>] [--server-addr=<server_addr>]
-    frpc -h | --help | --version
+    frpc -h | --help
+    frpc -v | --version
 
 Options:
     -c config_file              set config file
@@ -88,6 +89,13 @@ func main() {
 		client.ServerPort = serverPort
 	}
 
+	if args["-v"] != nil {
+		if args["-v"].(bool) {
+			fmt.Println(version.Full())
+			os.Exit(0)
+		}
+	}
+
 	log.InitLog(client.LogWay, client.LogFile, client.LogLevel, client.LogMaxDays)
 
 	// wait until all control goroutine exit

+ 11 - 11
src/frp/cmd/frps/main.go

@@ -36,19 +36,19 @@ import (
 var usage string = `frps is the server of frp
 
 Usage: 
-	frps [-c config_file] [-L log_file] [--log-level=<log_level>] [--addr=<bind_addr>]
-	frps --reload
-	frps -h | --help
-	frps -v | --version
+    frps [-c config_file] [-L log_file] [--log-level=<log_level>] [--addr=<bind_addr>]
+    frps --reload
+    frps -h | --help
+    frps -v | --version
 
 Options:
-	-c config_file            set config file
-	-L log_file               set output log file, including console
-	--log-level=<log_level>   set log level: debug, info, warn, error
-	--addr=<bind_addr>        listen addr for client, example: 0.0.0.0:7000
-	--reload                  reload ini file and configures in common section won't be changed
-	-h --help                 show this screen
-	-v --version              show version
+    -c config_file            set config file
+    -L log_file               set output log file, including console
+    --log-level=<log_level>   set log level: debug, info, warn, error
+    --addr=<bind_addr>        listen addr for client, example: 0.0.0.0:7000
+    --reload                  reload ini file and configures in common section won't be changed
+    -h --help                 show this screen
+    -v --version              show version
 `
 
 func main() {