feat(grafana-cli): minor changes

pkg/cmd/grafana-cli/commands/install_command.go

@@ -5,10 +5,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/fatih/color"
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
-	m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
-	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -16,6 +12,11 @@ import (
 	"path"
 	"regexp"
 	"strings"
+
+	"github.com/fatih/color"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
+	m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
+	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 )
 
 func validateInput(c CommandLine, pluginFolder string) error {
@@ -24,17 +25,16 @@ func validateInput(c CommandLine, pluginFolder string) error {
 		return errors.New("please specify plugin to install")
 	}
 
-	pluginDir := c.GlobalString("path")
-	if pluginDir == "" {
-		return errors.New("missing path flag")
+	pluginsDir := c.GlobalString("pluginsDir")
+	if pluginsDir == "" {
+		return errors.New("missing pluginsDir flag")
 	}
 
-	fileInfo, err := os.Stat(pluginDir)
+	fileInfo, err := os.Stat(pluginsDir)
 	if err != nil {
-		if err = os.MkdirAll(pluginDir, os.ModePerm); err != nil {
-			return errors.New("path is not a directory")
+		if err = os.MkdirAll(pluginsDir, os.ModePerm); err != nil {
+			return errors.New(fmt.Sprintf("pluginsDir (%s) is not a directory", pluginsDir))
 		}
-
 		return nil
 	}
 
@@ -46,7 +46,7 @@ func validateInput(c CommandLine, pluginFolder string) error {
 }
 
 func installCommand(c CommandLine) error {
-	pluginFolder := c.GlobalString("path")
+	pluginFolder := c.GlobalString("pluginsDir")
 	if err := validateInput(c, pluginFolder); err != nil {
 		return err
 	}
@@ -59,7 +59,7 @@ func installCommand(c CommandLine) error {
 
 func InstallPlugin(pluginName, version string, c CommandLine) error {
 	plugin, err := s.GetPlugin(pluginName, c.GlobalString("repo"))
-	pluginFolder := c.GlobalString("path")
+	pluginFolder := c.GlobalString("pluginsDir")
 	if err != nil {
 		return err
 	}