public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: explore possibilities of using makefile (#17039)

Browse Source 
* Chore: explore possibilities of using makefile

This is an exploratory commit - I wanted to see how
revive/gosec linters could be integrated with makefile and our build scripts.

Looks better then I expected :)

* Chore: make revive happy

Revive execution was not supplied with path, if you restore there is couple
errors that were popping up - so I fixed them

* Chore: make revive happy
This commit is contained in:
Oleg Gaidarenko
2019-05-16 00:29:26 +03:00
committed by GitHub
parent 8483a8366f
commit be66ed9dab
13 changed files with 119 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/grafana-cli/utils/grafana_path.go
+5 -5
View File
@@ -31,12 +31,12 @@ func isDevEnvironment() bool {
defaultsPath := filepath.Join(exPath, "../conf/defaults.ini")
_, err = os.Stat(defaultsPath)
return err == nil
} else {
// But at the same time there are per platform directories that contain the binaries and can also be used.
defaultsPath := filepath.Join(exPath, "../../conf/defaults.ini")
_, err = os.Stat(defaultsPath)
return err == nil
}
// But at the same time there are per platform directories that contain the binaries and can also be used.
defaultsPath := filepath.Join(exPath, "../../conf/defaults.ini")
_, err = os.Stat(defaultsPath)
return err == nil
}
func returnOsDefault(currentOs string) string {