feat(cli): detects plugin folder for dev env

bergquist · bergquist · commit a5eda6a87b9f · 2016-04-11T22:32:46.000+02:00
closes grafana#4572
diff --git a/pkg/cmd/grafana-cli/main.go b/pkg/cmd/grafana-cli/main.go
@@ -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() {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"github.com/codegangsta/cli"`
`9`	`9`	`"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"`
`10`	`10`	`"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"`
`11`		`- "strings"`
`12`	`11`	`)`
`13`	`12`
`14`	`13`	`var version = "master"`
`@@ -18,7 +17,7 @@ func getGrafanaPluginDir() string {`
`18`	`17`	`defaultNix := "/var/lib/grafana/plugins"`
`19`	`18`
`20`	`19`	`if currentOS == "windows" {`
`21`		`- return "C:\\opt\\grafana\\plugins"`
	`20`	`+ return "..\\data\\plugins"`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`pwd, err := os.Getwd()`
`@@ -29,16 +28,16 @@ func getGrafanaPluginDir() string {`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`if isDevenvironment(pwd) {`
`32`		`- return "../../../data/plugins"`
	`31`	`+ return "../data/plugins"`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`return defaultNix`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`func isDevenvironment(pwd string) bool {`
`39`		`- // if grafana-cli is executed from the cmd folder we can assume`
`40`		`- // that its in development environment.`
`41`		`- return strings.HasSuffix(pwd, "/pkg/cmd/grafana-cli")`
	`38`	`+ // if ../conf/default.ini exists, grafana is not installed as package`
	`39`	`+ _, err := os.Stat("../conf/default.ini")`
	`40`	`+ return err != nil`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`func main() {`