IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4758 from bergquist/cli_local_pluginfolder

Browse Source 
CLI: Adds support for local plugin folder
This commit is contained in:
Carl Bergquist 2016-04-19 17:30:01 +02:00
commit 9f4ad73698
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/cmd/grafana-cli/main.go
View File

@ -8,7 +8,6 @@ import (
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands" "github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/log" "github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
"strings"
) )
var version = "master" var version = "master"
@ -18,7 +17,7 @@ func getGrafanaPluginDir() string {
defaultNix := "/var/lib/grafana/plugins" defaultNix := "/var/lib/grafana/plugins"
if currentOS == "windows" { if currentOS == "windows" {
return "C:\\opt\\grafana\\plugins" return "../data/plugins"
} }
pwd, err := os.Getwd() pwd, err := os.Getwd()
@ -29,16 +28,17 @@ func getGrafanaPluginDir() string {
} }
if isDevenvironment(pwd) { if isDevenvironment(pwd) {
return "../../../data/plugins" return "../data/plugins"
} }
return defaultNix return defaultNix
} }
func isDevenvironment(pwd string) bool { func isDevenvironment(pwd string) bool {
// if grafana-cli is executed from the cmd folder we can assume // if ../conf/defaults.ini exists, grafana is not installed as package
// that its in development environment. // that its in development environment.
return strings.HasSuffix(pwd, "/pkg/cmd/grafana-cli") _, err := os.Stat("../conf/defaults.ini")
return err == nil
} }
func main() { func main() {