From 5c1049054eace710abd3418bbad141fbb7dd5d7f Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 23 May 2017 11:06:25 -0400 Subject: 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 --- utils/license.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'utils/license.go') 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 } -- cgit v1.2.3-1-g7c22