Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename guiAssets to assetDir for consistency

This commit is contained in:
Anderson Mesquita 2015-12-18 12:00:59 -05:00
parent 490962ccdb
commit b014967550
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/syncthing/main.go
View File

@ -209,7 +209,7 @@ type RuntimeOptions struct {
generateDir string
noRestart bool
profiler string
guiAssets string
assetDir string
cpuProfile bool
stRestarting bool
logFlags int
@ -219,15 +219,15 @@ func defaultRuntimeOptions() RuntimeOptions {
options := RuntimeOptions{
noRestart: os.Getenv("STNORESTART") != "",
profiler: os.Getenv("STPROFILER"),
guiAssets: os.Getenv("STGUIASSETS"),
assetDir: os.Getenv("STGUIASSETS"),
cpuProfile: os.Getenv("STCPUPROFILE") != "",
stRestarting: os.Getenv("STRESTART") != "",
logFile: "-", // Output to stdout
logFlags: log.Ltime,
}
if options.guiAssets != "" {
options.guiAssets = locations[locGUIAssets]
if options.assetDir != "" {
options.assetDir = locations[locGUIAssets]
}
if os.Getenv("STTRACE") != "" {
@ -976,7 +976,7 @@ func setupGUI(mainSvc *suture.Supervisor, cfg *config.Wrapper, m *model.Model, a
l.Warnln("Insecure admin access is enabled.")
}
api, err := newAPISvc(myID, cfg, runtimeOptions.guiAssets, m, apiSub, discoverer, relaySvc, errors, systemLog)
api, err := newAPISvc(myID, cfg, runtimeOptions.assetDir, m, apiSub, discoverer, relaySvc, errors, systemLog)
if err != nil {
l.Fatalln("Cannot start GUI:", err)
}