-version command line option

diff --git a/VERSION b/VERSION
index 95ee81a411792c5d968d8b3f783e35e690aaeaed..f9ce5a96efa2084f1e5e4e342358198b7159cbec 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.9
+5.10

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index a3981d35b804fe12e81226849ccaecd0951bc40b..38d03364becef1c412bbc7f320b77f13ccebe7bc 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,12 @@
 @node Новости
 @section Новости
 
+@node Релиз 5.10
+@subsection Релиз 5.10
+@itemize
+@item Добавлена @option{-version} опция, выводящая версию программы.
+@end itemize
+
 @node Релиз 5.9
 @subsection Релиз 5.9
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index 3fa2169ee0d1f0b1c6f844b3668f50b13f666656..58b6d129bbb3021ae4e19bb21bf52f806b973ed3 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,12 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 5.10
+@section Release 5.10
+@itemize
+@item @option{-version} option added, printing program version.
+@end itemize
+
 @node Release 5.9
 @section Release 5.9
 @itemize

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
index 98a5b21e6418953620a6b262e02ce69a028bb98b..c7b04a7635af89d2e2fdb8fa931543a996295764 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
@@ -51,6 +51,7 @@ var (
        cpr         = flag.Int("cpr", 0, "Enable constant KiB/sec out traffic rate")
        egdPath     = flag.String("egd", "", "Optional path to EGD socket")
        syslog      = flag.Bool("syslog", false, "Enable logging to syslog")
+       version     = flag.Bool("version", false, "Print version information")
        warranty    = flag.Bool("warranty", false, "Print warranty information")
 
        conf        *govpn.PeerConf
@@ -67,6 +68,10 @@ func main() {
                fmt.Println(govpn.Warranty)
                return
        }
+       if *version {
+               fmt.Println(govpn.VersionGet())
+               return
+       }
        timeout = *timeoutP
        var err error
        log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
index c70e82a3f1da9d22f078ec2187a14eaf30428de6..68a0172f40ca42b2df66fae78a2d414ac4cf45b9 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
@@ -39,6 +39,7 @@ var (
        proxy    = flag.String("proxy", "", "Enable HTTP proxy on host:port")
        egdPath  = flag.String("egd", "", "Optional path to EGD socket")
        syslog   = flag.Bool("syslog", false, "Enable logging to syslog")
+       version  = flag.Bool("version", false, "Print version information")
        warranty = flag.Bool("warranty", false, "Print warranty information")
 )
 
@@ -48,6 +49,10 @@ func main() {
                fmt.Println(govpn.Warranty)
                return
        }
+       if *version {
+               fmt.Println(govpn.VersionGet())
+               return
+       }
        timeout := time.Second * time.Duration(govpn.TimeoutDefault)
        log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)
        log.Println(govpn.VersionGet())

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
index d5dcfa584d4686fd20c74f2f6b1dae421fbab4b8..16f7847ea8fdbd8061d534449821618b7b1cfb2c 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
@@ -36,6 +36,7 @@ var (
        tOpt     = flag.Int("t", govpn.DefaultT, "Argon2d iteration parameter")
        pOpt     = flag.Int("p", govpn.DefaultP, "Argon2d parallelizm parameter")
        egdPath  = flag.String("egd", "", "Optional path to EGD socket")
+       version  = flag.Bool("version", false, "Print version information")
        warranty = flag.Bool("warranty", false, "Print warranty information")
 )
 
@@ -45,6 +46,10 @@ func main() {
                fmt.Println(govpn.Warranty)
                return
        }
+       if *version {
+               fmt.Println(govpn.VersionGet())
+               return
+       }
        if *egdPath != "" {
                govpn.EGDInit(*egdPath)
        }