diff --git a/cmd/enbas/flags.go b/cmd/enbas/flags.go index df46ae5..912c9df 100644 --- a/cmd/enbas/flags.go +++ b/cmd/enbas/flags.go @@ -15,3 +15,7 @@ func (a *accountNames) Set(value string) error { return nil } + +type topLevelFlags struct { + configDir string +} diff --git a/cmd/enbas/main.go b/cmd/enbas/main.go index 898da31..daf5d00 100644 --- a/cmd/enbas/main.go +++ b/cmd/enbas/main.go @@ -88,6 +88,10 @@ func run() error { unblock: "unblock a resource (e.g. an account)", } + globals := topLevelFlags{} + + flag.StringVar(&globals.configDir, "config-dir", "", "specify your config directory") + flag.Usage = enbasUsageFunc(summaries) flag.Parse() @@ -119,7 +123,7 @@ func run() error { case updateResource: executor = newUpdateCommand(updateResource, summaries[updateResource]) case whoami: - executor = newWhoAmICommand(whoami, summaries[whoami]) + executor = newWhoAmICommand(globals, whoami, summaries[whoami]) case add: executor = newAddCommand(add, summaries[add]) case remove: diff --git a/cmd/enbas/usage.go b/cmd/enbas/usage.go index 4536ed3..e055937 100644 --- a/cmd/enbas/usage.go +++ b/cmd/enbas/usage.go @@ -53,7 +53,7 @@ func enbasUsageFunc(summaries map[string]string) func() { builder.WriteString("SUMMARY:\n enbas - A GoToSocial client for the terminal.\n\n") if binaryVersion != "" { - builder.WriteString("VERSION:\n " + binaryVersion + "\n\n") + builder.WriteString("VERSION:\n " + binaryVersion + "\n\n") } builder.WriteString("USAGE:\n enbas [flags]\n enbas [command]\n\nCOMMANDS:") diff --git a/cmd/enbas/whoami.go b/cmd/enbas/whoami.go index d87174a..1f55d78 100644 --- a/cmd/enbas/whoami.go +++ b/cmd/enbas/whoami.go @@ -9,11 +9,14 @@ import ( type whoAmICommand struct { *flag.FlagSet + + globals topLevelFlags } -func newWhoAmICommand(name, summary string) *whoAmICommand { +func newWhoAmICommand(globals topLevelFlags, name, summary string) *whoAmICommand { command := whoAmICommand{ FlagSet: flag.NewFlagSet(name, flag.ExitOnError), + globals: globals, } command.Usage = commandUsageFunc(name, summary, command.FlagSet)