marge: 合并11.2版本

This commit is contained in:
TsMask
2024-11-23 10:17:58 +08:00
parent 7bcb439d57
commit e5212c47ba
88 changed files with 11678 additions and 3054 deletions

View File

@@ -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)
}