perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct GUI asset dir handling (fixes #2621)

Browse Source
This commit is contained in:
Jakob Borg
2015-12-26 13:31:58 +01:00
parent b7a58d2f87
commit 8b726c7e8b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/syncthing/main.go
View File

@@ -225,10 +225,6 @@ func defaultRuntimeOptions() RuntimeOptions {
logFlags: log.Ltime, logFlags: log.Ltime,
} }
if options.assetDir != "" {
options.assetDir = locations[locGUIAssets]
}
if os.Getenv("STTRACE") != "" { if os.Getenv("STTRACE") != "" {
options.logFlags = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile options.logFlags = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile
} }
@@ -308,6 +304,12 @@ func main() {
options.logFile = locations[locLogFile] options.logFile = locations[locLogFile]
} }
if options.assetDir == "" {
// The asset dir is blank if STGUIASSETS wasn't set, in which case we
// should look for extra assets in the default place.
options.assetDir = locations[locGUIAssets]
}
if options.showVersion { if options.showVersion {
fmt.Println(LongVersion) fmt.Println(LongVersion)
return return