summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2018-05-17 12:40:40 -0700
committerGitHub <noreply@github.com>2018-05-17 12:40:40 -0700
commit11cbb597471127c1b29e78e6cad0a1a4d93ea24c (patch)
tree0eceb950872c7234348f0b41d4492073908840d0 /utils/config.go
parent1f6c271b3bedd6656ae7155714423b1b39a669c1 (diff)
downloadchat-11cbb597471127c1b29e78e6cad0a1a4d93ea24c.tar.gz
chat-11cbb597471127c1b29e78e6cad0a1a4d93ea24c.tar.bz2
chat-11cbb597471127c1b29e78e6cad0a1a4d93ea24c.zip
Renaming platform binary to mattermost. (#8801)
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/config.go b/utils/config.go
index 1b5fc7674..1a68b80d7 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -41,7 +41,7 @@ func FindConfigFile(fileName string) (path string) {
return fileName
}
} else {
- for _, dir := range []string{"./config", "../config", "../../config", "."} {
+ for _, dir := range []string{"./config", "../config", "../../config", "../../../config", "."} {
path, _ := filepath.Abs(filepath.Join(dir, fileName))
if _, err := os.Stat(path); err == nil {
return path
@@ -53,7 +53,7 @@ func FindConfigFile(fileName string) (path string) {
// FindDir looks for the given directory in nearby ancestors, falling back to `./` if not found.
func FindDir(dir string) (string, bool) {
- for _, parent := range []string{".", "..", "../.."} {
+ for _, parent := range []string{".", "..", "../..", "../../.."} {
foundDir, err := filepath.Abs(filepath.Join(parent, dir))
if err != nil {
continue