public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(cli): align code with core grafana

Browse Source
This commit is contained in:
bergquist
2016-02-15 16:11:37 +01:00
parent 9c50b89d64
commit 746257710b
7 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/grafana-cli/commands/install_command.go
+3 -3
View File
@@ -6,7 +6,7 @@ import (
"errors"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
services "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
"io"
"io/ioutil"
"net/http"
@@ -49,7 +49,7 @@ func installCommand(c CommandLine) error {
}
func InstallPlugin(pluginName, pluginFolder, version string) error {
plugin, err := services.GetPlugin(pluginName)
plugin, err := s.GetPlugin(pluginName)
if err != nil {
return err
}
@@ -74,7 +74,7 @@ func InstallPlugin(pluginName, pluginFolder, version string) error {
log.Info("Installed %s successfully ✔\n", plugin.Id)
}
res := services.ReadPlugin(pluginFolder, pluginName)
res := s.ReadPlugin(pluginFolder, pluginName)
for _, v := range res.Dependency.Plugins {
log.Infof("Installing Dependency: %s\n", v.Id)