IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-07 22:53:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(cli): detects plugin folder for dev env

Browse Source 
closes #4572
This commit is contained in:
bergquist 2016-04-11 22:31:16 +02:00
parent 01c6b56685
commit a5eda6a87b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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