mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2025-05-11 01:55:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Pull request: 2416 improve version output

Browse source 
Merge in DNS/adguard-home from 2416-version to master

Updates .

Squashed commit of the following:

commit ad529ee429abd7fa12400e089a4e566da3df9f66
Merge: 9ba2f684 bfc7e16d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Mar 31 12:42:37 2021 +0300

    Merge branch 'master' into 2416-version

commit 9ba2f6845b1202909f3e142ae99e44815c9e090e
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Mar 31 12:40:53 2021 +0300

    all: fix docs

commit 521a61df49381fecf1bc992752d7cbbcccb23bb6
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 30 17:48:56 2021 +0300

    all: imp code

commit 844c4e0fb0192779bea4bfd3b0f5e4cf69e2073c
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 30 17:48:56 2021 +0300

    all: imp docs, log changes

commit c8206b0d161a7040dec7983dbaa240a8d08f4746
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 30 17:19:51 2021 +0300

    version: imp verbose output

commit b2b41d478023bdd2dd01a73c44be309ba94e4ac8
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 30 16:37:23 2021 +0300

    version: imp code, docs

commit 553bd9ce5fb59348f5ecd21a762dccf3834befee
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 30 14:07:05 2021 +0300

    version: imp verbosed output
This commit is contained in:
Eugene Burkov 2021-03-31 12:55:21 +03:00
parent bfc7e16d84
commit 1d07afb30e
7 changed files with 192 additions and 29 deletions
internal/home
options.go

24
internal/home/options.go
View file

@ -191,16 +191,28 @@ var glinetArg = arg{
}
var versionArg = arg{
"Show the version and exit",
"version", "",
nil, nil, func(o options, exec string) (effect, error) {
return func() error { fmt.Println(version.Full()); os.Exit(0); return nil }, nil
description: "Show the version and exit",
longName: "version",
shortName: "",
updateWithValue: nil,
updateNoValue: nil,
effect: func(o options, exec string) (effect, error) {
return func() error {
if o.verbose {
fmt.Println(version.Verbose())
} else {
fmt.Println(version.Full())
}
os.Exit(0)
return nil
}, nil
},
func(o options) []string { return nil },
serialize: func(o options) []string { return nil },
}
var helpArg = arg{
"Print this help",
"Print this help. Show more detailed version description with -v",
"help", "",
nil, nil, func(o options, exec string) (effect, error) {
return func() error { _ = printHelp(exec); os.Exit(64); return nil }, nil