diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-18 08:23:02 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-18 08:23:02 -0400 |
| commit | 78d95a25f799f818de03e9aa58a131407b6c122f (patch) | |
| tree | 2321e7967a0d9e05d96536e9ae9cff40f98d53f3 /utils | |
| parent | 8a0702e0c31014c5f2f8bad8c9e32e9343252469 (diff) | |
| parent | e591fcf3d8c61c3df7d1d8457ae7b72bfe3abf1b (diff) | |
| download | chat-78d95a25f799f818de03e9aa58a131407b6c122f.tar.gz chat-78d95a25f799f818de03e9aa58a131407b6c122f.tar.bz2 chat-78d95a25f799f818de03e9aa58a131407b6c122f.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 4 |
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 |