Merge pull request #1946 from calmh/guiassets

Default GUI override dir
This commit is contained in:
Audrius Butkevicius 2015-06-14 21:40:56 +01:00
commit fee0d7168a
2 changed files with 6 additions and 0 deletions

View File

@ -31,6 +31,7 @@ const (
locCsrfTokens = "csrfTokens" locCsrfTokens = "csrfTokens"
locPanicLog = "panicLog" locPanicLog = "panicLog"
locAuditLog = "auditLog" locAuditLog = "auditLog"
locGUIAssets = "GUIAssets"
locDefFolder = "defFolder" locDefFolder = "defFolder"
) )
@ -52,6 +53,7 @@ var locations = map[locationEnum]string{
locCsrfTokens: "${config}/csrftokens.txt", locCsrfTokens: "${config}/csrftokens.txt",
locPanicLog: "${config}/panic-${timestamp}.log", locPanicLog: "${config}/panic-${timestamp}.log",
locAuditLog: "${config}/audit-${timestamp}.log", locAuditLog: "${config}/audit-${timestamp}.log",
locGUIAssets: "${config}/gui",
locDefFolder: "${home}/Sync", locDefFolder: "${home}/Sync",
} }

View File

@ -252,6 +252,10 @@ func main() {
l.Fatalln(err) l.Fatalln(err)
} }
if guiAssets == "" {
guiAssets = locations[locGUIAssets]
}
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
if logFile == "" { if logFile == "" {
// Use the default log file location // Use the default log file location