change(grafana-cli): changed upgrade to update in command line, upgrade and upgrade-all will still work as aliases

torkelo · torkelo · commit f93b039e426e · 2016-04-11T18:05:28.000-04:00
diff --git a/docs/sources/plugins/installation.md b/docs/sources/plugins/installation.md
@@ -28,14 +28,14 @@ List installed plugins
 grafana-cli plugins ls
 ```
 
-Upgrade all installed plugins
+Update all installed plugins
 ```
-grafana-cli plugins upgrade-all
+grafana-cli plugins update-all
 ```
 
-Upgrade one plugin
+Update one plugin
 ```
-grafana-cli plugins upgrade <plugin-id>
+grafana-cli plugins update <plugin-id>
 ```
 
 Remove one plugin
diff --git a/pkg/cmd/grafana-cli/commands/commands.go b/pkg/cmd/grafana-cli/commands/commands.go
@@ -1,9 +1,10 @@
 package commands
 
 import (
+	"os"
+
 	"github.com/codegangsta/cli"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
-	"os"
 )
 
 func runCommand(command func(commandLine CommandLine) error) func(context *cli.Context) {
@@ -32,13 +33,15 @@ var pluginCommands = []cli.Command{
 		Usage:  "list remote available plugins",
 		Action: runCommand(listremoteCommand),
 	}, {
-		Name:   "upgrade",
-		Usage:  "upgrade <plugin id>",
-		Action: runCommand(upgradeCommand),
+		Name:    "update",
+		Usage:   "update <plugin id>",
+		Aliases: []string{"upgrade"},
+		Action:  runCommand(upgradeCommand),
 	}, {
-		Name:   "upgrade-all",
-		Usage:  "upgrades all your installed plugins",
-		Action: runCommand(upgradeAllCommand),
+		Name:    "update-all",
+		Aliases: []string{"upgrade-all"},
+		Usage:   "update all your installed plugins",
+		Action:  runCommand(upgradeAllCommand),
 	}, {
 		Name:   "ls",
 		Usage:  "list all installed plugins",
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_all_command.go b/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
@@ -51,7 +51,7 @@ func upgradeAllCommand(c CommandLine) error {
 	}
 
 	for _, p := range pluginsToUpgrade {
-		log.Infof("Upgrading %v \n", p.Id)
+		log.Infof("Updating %v \n", p.Id)
 
 		s.RemoveInstalledPlugin(pluginsDir, p.Id)
 		InstallPlugin(p.Id, "", c)

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func upgradeAllCommand(c CommandLine) error {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`for _, p := range pluginsToUpgrade {`
`54`		`- log.Infof("Upgrading %v \n", p.Id)`
	`54`	`+ log.Infof("Updating %v \n", p.Id)`
`55`	`55`
`56`	`56`	`s.RemoveInstalledPlugin(pluginsDir, p.Id)`
`57`	`57`	`InstallPlugin(p.Id, "", c)`