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

Revert "feat(cli): detects plugin folder for dev env"

Browse Source 
This reverts commit a5eda6a87b.
This commit is contained in:
Torkel Ödegaard 2016-04-15 09:01:27 -04:00
parent 75555c470b
commit d98839fc19
1 changed files with 6 additions and 5 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,6 +8,7 @@ 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"
@ -17,7 +18,7 @@ func getGrafanaPluginDir() string {
defaultNix := "/var/lib/grafana/plugins"
if currentOS == "windows" {
return "..\\data\\plugins"
return "C:\\opt\\grafana\\plugins"
}
pwd, err := os.Getwd()
@ -28,16 +29,16 @@ func getGrafanaPluginDir() string {
}
if isDevenvironment(pwd) {
return "../data/plugins"
return "../../../data/plugins"
}
return defaultNix
}
func isDevenvironment(pwd string) bool {
// if ../conf/default.ini exists, grafana is not installed as package
_, err := os.Stat("../conf/default.ini")
return err != nil
// 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")
}
func main() {