From b444194496c3761b1a8ce6e37262f2689f1e2c9a Mon Sep 17 00:00:00 2001 From: codeskyblue Date: Tue, 2 Aug 2016 16:06:44 +0800 Subject: [PATCH] fix root and addr default error --- main.go | 6 ++++-- testdata/config.yml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index 87a36c6..3d98673 100644 --- a/main.go +++ b/main.go @@ -78,6 +78,8 @@ func versionMessage() string { func parseFlags() error { // initial default conf + gcfg.Root = "./" + gcfg.Addr = ":8000" gcfg.Theme = "black" gcfg.PlistProxy = defaultPlistProxy gcfg.GoogleTrackerId = "UA-81205425-2" @@ -86,8 +88,8 @@ func parseFlags() error { kingpin.HelpFlag.Short('h') kingpin.Version(versionMessage()) kingpin.Flag("conf", "config file path, yaml format").FileVar(&gcfg.Conf) - kingpin.Flag("root", "root directory").Short('r').Default("./").StringVar(&gcfg.Root) - kingpin.Flag("addr", "listen address").Short('a').Default(":8000").StringVar(&gcfg.Addr) + kingpin.Flag("root", "root directory, default ./").Short('r').StringVar(&gcfg.Root) + kingpin.Flag("addr", "listen address, default :8000").Short('a').StringVar(&gcfg.Addr) kingpin.Flag("cert", "tls cert.pem path").StringVar(&gcfg.Cert) kingpin.Flag("key", "tls key.pem path").StringVar(&gcfg.Key) kingpin.Flag("httpauth", "HTTP basic auth (ex: user:pass)").StringVar(&gcfg.HttpAuth) diff --git a/testdata/config.yml b/testdata/config.yml index df4df52..272b575 100644 --- a/testdata/config.yml +++ b/testdata/config.yml @@ -1,5 +1,5 @@ --- -addr: ":8000" +addr: ":4000" title: "hello world" theme: green debug: true