signald/signald-go
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix SocketPath handling

Browse source 
- use config unless socket option is provided
- render default path in PUBLIC_DOC_MODE
This commit is contained in:
Sebastian Haas 2021-04-05 21:43:07 +02:00
parent 156db67aa6
commit c3f78b9dd8
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/signaldctl/cmd/root.go
View file

@ -69,11 +69,13 @@ func Execute() {
func init() { func init() {
cobra.OnInitialize(initConfig) cobra.OnInitialize(initConfig)
defaultConfigPath := fmt.Sprintf("%s/.config/signaldctl.yaml", os.Getenv("HOME")) defaultConfigPath := fmt.Sprintf("%s/.config/signaldctl.yaml", os.Getenv("HOME"))
defaultSocketPath := ""
if os.Getenv("SIGNALDCTL_PUBLIC_DOC_MODE") == "on" { if os.Getenv("SIGNALDCTL_PUBLIC_DOC_MODE") == "on" {
defaultConfigPath = "~/.config/signaldctl.yaml" defaultConfigPath = "~/.config/signaldctl.yaml"
defaultSocketPath = "/var/run/signald/signald.sock"
} }
RootCmd.PersistentFlags().StringVar(&config.Path, "config", defaultConfigPath, "config file") RootCmd.PersistentFlags().StringVar(&config.Path, "config", defaultConfigPath, "config file")
RootCmd.PersistentFlags().StringVar(&socketPath, "socket", "/var/run/signald/signald.sock", "the path to the signald socket file") RootCmd.PersistentFlags().StringVar(&socketPath, "socket", defaultSocketPath, "the path to the signald socket file")
RootCmd.PersistentFlags().StringVarP(&common.OutputFormat, "output-format", "o", "default", "the output format. options are usually table, yaml and json, default is usually table. Some commands have other options.") RootCmd.PersistentFlags().StringVarP(&common.OutputFormat, "output-format", "o", "default", "the output format. options are usually table, yaml and json, default is usually table. Some commands have other options.")
RootCmd.AddCommand(account.AccountCmd) RootCmd.AddCommand(account.AccountCmd)
RootCmd.AddCommand(configcmd.ConfigCmd) RootCmd.AddCommand(configcmd.ConfigCmd)