CLI: Move duplicated config flag to global flag

This commit is contained in:
Jason Wilder 2015-02-15 11:48:39 -07:00
parent dda760b9b5
commit 9cb1170361
5 changed files with 7 additions and 41 deletions

View File

@ -34,7 +34,13 @@ func main() {
app.Commands = []cli.Command{cmd.Web, cmd.ImportJson,
cmd.ListAccounts, cmd.CreateAccount, cmd.DeleteAccount,
cmd.ListDataSources}
app.Flags = append(app.Flags, []cli.Flag{}...)
app.Flags = append(app.Flags, []cli.Flag{
cli.StringFlag{
Name: "config",
Value: "grafana.ini",
Usage: "path to config file",
},
}...)
app.Run(os.Args)
log.Close()

View File

@ -17,13 +17,6 @@ var ListAccounts = cli.Command{
Usage: "list accounts",
Description: "Lists the accounts in the system",
Action: listAccounts,
Flags: []cli.Flag{
cli.StringFlag{
Name: "config",
Value: "grafana.ini",
Usage: "path to config file",
},
},
}
var CreateAccount = cli.Command{
@ -31,13 +24,6 @@ var CreateAccount = cli.Command{
Usage: "create a new account",
Description: "Creates a new account",
Action: createAccount,
Flags: []cli.Flag{
cli.StringFlag{
Name: "config",
Value: "grafana.ini",
Usage: "path to config file",
},
},
}
var DeleteAccount = cli.Command{
@ -45,13 +31,6 @@ var DeleteAccount = cli.Command{
Usage: "delete an existing account",
Description: "Deletes an existing account",
Action: deleteAccount,
Flags: []cli.Flag{
cli.StringFlag{
Name: "config",
Value: "grafana.ini",
Usage: "path to config file",
},
},
}
func listAccounts(c *cli.Context) {

View File

@ -17,13 +17,6 @@ var ListDataSources = cli.Command{
Usage: "list datasources",
Description: "Lists the datasources in the system",
Action: listDatasources,
Flags: []cli.Flag{
cli.StringFlag{
Name: "config",
Value: "grafana.ini",
Usage: "path to config file",
},
},
}
func listDatasources(c *cli.Context) {

View File

@ -28,11 +28,6 @@ var ImportJson = cli.Command{
Name: "account",
Usage: "Account name to save dashboards under",
},
cli.StringFlag{
Name: "config",
Value: "grafana.ini",
Usage: "path to config file",
},
},
}

View File

@ -27,13 +27,6 @@ var Web = cli.Command{
Usage: "grafana web",
Description: "Starts Grafana backend & web server",
Action: runWeb,
Flags: []cli.Flag{
cli.StringFlag{
Name: "config",
Value: "grafana.ini",
Usage: "path to config file",
},
},
}
func newMacaron() *macaron.Macaron {