diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-23 11:06:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 11:06:25 -0400 |
| commit | 5c1049054eace710abd3418bbad141fbb7dd5d7f (patch) | |
| tree | 24d75c14ce2aae2c6f1a8d5bc7392e958e416666 /utils/license.go | |
| parent | 69f3f2fdce4ae21a037ca61d753279efcc70f0ec (diff) | |
| download | chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.tar.gz chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.tar.bz2 chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.zip | |
PLT-6471 Properly panic when translations can't be loaded (#6414)
* PLT-6471 Properly panic when translations can't be loaded
* Print usage messages when errors occur during CLI initialization
* Reverted behaviour of FindDir and added second return value to it
* Fixed merge conflict
Diffstat (limited to 'utils/license.go')
| -rw-r--r-- | utils/license.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/license.go b/utils/license.go index c0a17bf79..03a9d7ab3 100644 --- a/utils/license.go +++ b/utils/license.go @@ -152,7 +152,8 @@ func GetLicenseFileFromDisk(fileName string) []byte { func GetLicenseFileLocation(fileLocation string) string { if fileLocation == "" { - return FindDir("config") + "mattermost.mattermost-license" + configDir, _ := FindDir("config") + return configDir + "mattermost.mattermost-license" } else { return fileLocation } |