Merge branch 'master' of github.com:grafana/grafana

pkg/cmd/grafana-cli/commands/install_command.go

@@ -14,6 +14,7 @@ import (
 	"os"
 	"os"
 	"path"
 	"path"
 	"regexp"
 	"regexp"
+	"strings"
 )
 )
 
 
 func validateInput(c CommandLine, pluginFolder string) error {
 func validateInput(c CommandLine, pluginFolder string) error {
@@ -160,7 +161,11 @@ func downloadFile(pluginName, filePath, url string) (err error) {
 		} else {
 		} else {
 			dst, err := os.Create(newFile)
 			dst, err := os.Create(newFile)
 			if err != nil {
 			if err != nil {
-				log.Errorf("%v", err)
+				if strings.Contains(err.Error(), "permission denied") {
+					return fmt.Errorf(
+						"Could not create file %s. permission deined. Make sure you have write access to plugindir",
+						newFile)
+				}
 			}
 			}
 			defer dst.Close()
 			defer dst.Close()
 			src, err := zf.Open()
 			src, err := zf.Open()