From f38ea59569404c8fa967f6d78279a2227f421a16 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Fri, 13 Dec 2024 01:10:46 +0300 Subject: [PATCH] set the separator as a config and not an arg --- cmd/africastalking/main.go | 4 +--- cmd/async/main.go | 4 +--- cmd/http/main.go | 4 +--- cmd/main.go | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/cmd/africastalking/main.go b/cmd/africastalking/main.go index f57f8f4..11d78b2 100644 --- a/cmd/africastalking/main.go +++ b/cmd/africastalking/main.go @@ -115,7 +115,6 @@ func main() { var engineDebug bool var host string var port uint - var separator string flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from") flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir") flag.StringVar(&database, "db", "gdbm", "database to be used") @@ -123,7 +122,6 @@ func main() { flag.UintVar(&size, "s", 160, "max size of output") flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host") flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port") - flag.StringVar(&separator, "sep", ": ", "custom separator for the menu") flag.Parse() logg.Infof("start command", "build", build, "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size) @@ -136,7 +134,7 @@ func main() { Root: "root", OutputSize: uint32(size), FlagCount: uint32(128), - MenuSeparator: separator, + MenuSeparator: ": ", } if engineDebug { diff --git a/cmd/async/main.go b/cmd/async/main.go index 1fdc532..a5cac92 100644 --- a/cmd/async/main.go +++ b/cmd/async/main.go @@ -53,7 +53,6 @@ func main() { var engineDebug bool var host string var port uint - var separator string flag.StringVar(&sessionId, "session-id", "075xx2123", "session id") flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from") flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir") @@ -62,7 +61,6 @@ func main() { flag.UintVar(&size, "s", 160, "max size of output") flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host") flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port") - flag.StringVar(&separator, "sep", ": ", "custom separator for the menu") flag.Parse() logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size, "sessionId", sessionId) @@ -75,7 +73,7 @@ func main() { Root: "root", OutputSize: uint32(size), FlagCount: uint32(128), - MenuSeparator: separator, + MenuSeparator: ": ", } if engineDebug { diff --git a/cmd/http/main.go b/cmd/http/main.go index aa7d00a..451d693 100644 --- a/cmd/http/main.go +++ b/cmd/http/main.go @@ -42,7 +42,6 @@ func main() { var engineDebug bool var host string var port uint - var separator string flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from") flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir") flag.StringVar(&database, "db", "gdbm", "database to be used") @@ -50,7 +49,6 @@ func main() { flag.UintVar(&size, "s", 160, "max size of output") flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host") flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port") - flag.StringVar(&separator, "sep", ": ", "custom separator for the menu") flag.Parse() logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size) @@ -63,7 +61,7 @@ func main() { Root: "root", OutputSize: uint32(size), FlagCount: uint32(128), - MenuSeparator: separator, + MenuSeparator: ": ", } if engineDebug { diff --git a/cmd/main.go b/cmd/main.go index aec6a14..ddcf7a5 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -34,13 +34,11 @@ func main() { var sessionId string var database string var engineDebug bool - var separator string flag.StringVar(&sessionId, "session-id", "075xx2123", "session id") flag.StringVar(&database, "db", "gdbm", "database to be used") flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from") flag.BoolVar(&engineDebug, "d", false, "use engine debug output") flag.UintVar(&size, "s", 160, "max size of output") - flag.StringVar(&separator, "sep", ": ", "custom separator for the menu") flag.Parse() logg.Infof("start command", "dbdir", dbDir, "outputsize", size) @@ -55,7 +53,7 @@ func main() { SessionId: sessionId, OutputSize: uint32(size), FlagCount: uint32(128), - MenuSeparator: separator, + MenuSeparator: ": ", } resourceDir := scriptDir