diff --git a/captrace/config/config.go b/captrace/config/config.go index 19c2e35e..38015020 100644 --- a/captrace/config/config.go +++ b/captrace/config/config.go @@ -110,15 +110,17 @@ const defaultConfigFile = "./etc/capconf.yaml" func init() { cfile := flag.String("c", defaultConfigFile, "config file") - pv := flag.Bool("version", false, "print version") - ph := flag.Bool("help", false, "print help") + pv := flag.Bool("v", false, "print version") + pversion := flag.Bool("version", false, "print version") + ph := flag.Bool("h", false, "print help") + phelp := flag.Bool("help", false, "print help") flag.Parse() - if *pv { + if *pv || *pversion { fmt.Printf("OMC captrace version: %s\n%s\n%s\n\n", global.Version, global.BuildTime, global.GoVer) os.Exit(0) } - if *ph { + if *ph || *phelp { flag.Usage() os.Exit(0) } diff --git a/crontask/config.go b/crontask/config.go index 0ba3deb2..2a616ace 100644 --- a/crontask/config.go +++ b/crontask/config.go @@ -179,14 +179,16 @@ var ConfigFile *string func init() { ConfigFile = flag.String("c", defaultConfigFile, "config file") pv := flag.Bool("v", false, "print version") + pversion := flag.Bool("version", false, "print version") ph := flag.Bool("h", false, "print help") + phelp := flag.Bool("help", false, "print help") flag.Parse() - if *pv { + if *pv || *pversion { fmt.Printf("OMC crontask version: %s\n%s\n%s\n\n", global.Version, global.BuildTime, global.GoVer) os.Exit(0) } - if *ph { + if *ph || *phelp { flag.Usage() os.Exit(0) } diff --git a/misc/omcsvc.sh b/misc/omcsvc.sh index ad242725..037a27b1 100644 --- a/misc/omcsvc.sh +++ b/misc/omcsvc.sh @@ -31,7 +31,7 @@ case "$1" in ;; version) for procName in $ProcList;do - $BinDir/$procName -v + $BinDir/$procName --version done ;; *) diff --git a/sshsvc/config/config.go b/sshsvc/config/config.go index ab4b0ed2..fcf978a4 100644 --- a/sshsvc/config/config.go +++ b/sshsvc/config/config.go @@ -167,14 +167,16 @@ const DefaultConfigFile = "./etc/sshsvc.yaml" func init() { cfile := flag.String("c", DefaultConfigFile, "config file") pv := flag.Bool("v", false, "print version") + pversion := flag.Bool("version", false, "print version") ph := flag.Bool("h", false, "print help") + phelp := flag.Bool("help", false, "print help") flag.Parse() - if *pv { + if *pv || *pversion { fmt.Printf("OMC sshsvc version: %s\n%s\n%s\n\n", global.Version, global.BuildTime, global.GoVer) os.Exit(0) } - if *ph { + if *ph || *phelp { flag.Usage() os.Exit(0) }