Merge pull request #1578 from Zillode/fix-config-windows
Expand locations during initialisation (fixes #1575).
This commit is contained in:
commit
7fd1047832
|
@ -235,6 +235,10 @@ func main() {
|
||||||
baseDirs["config"] = confDir
|
baseDirs["config"] = confDir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := expandLocations(); err != nil {
|
||||||
|
l.Fatalln(err)
|
||||||
|
}
|
||||||
|
|
||||||
if runtime.GOOS == "windows" {
|
if runtime.GOOS == "windows" {
|
||||||
if logFile == "" {
|
if logFile == "" {
|
||||||
// Use the default log file location
|
// Use the default log file location
|
||||||
|
@ -245,10 +249,6 @@ func main() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := expandLocations(); err != nil {
|
|
||||||
l.Fatalln(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if showVersion {
|
if showVersion {
|
||||||
fmt.Println(LongVersion)
|
fmt.Println(LongVersion)
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in New Issue