octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 19:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't start when the config dir is not a dir

Browse Source
This commit is contained in:
Jakob Borg 2014-09-10 10:36:05 +02:00
parent 5d85a24977
commit 9ff04ee3d8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/syncthing/main.go
View File

@ -248,6 +248,12 @@ func main() {
return return
} }
confDir = expandTilde(confDir)
if info, err := os.Stat(confDir); err == nil && !info.IsDir() {
l.Fatalln("Config directory", confDir, "is not a directory")
}
if os.Getenv("STNORESTART") != "" { if os.Getenv("STNORESTART") != "" {
syncthingMain() syncthingMain()
} else { } else {
@ -266,8 +272,6 @@ func syncthingMain() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())
} }
confDir = expandTilde(confDir)
events.Default.Log(events.Starting, map[string]string{"home": confDir}) events.Default.Log(events.Starting, map[string]string{"home": confDir})
if _, err = os.Stat(confDir); err != nil && confDir == getDefaultConfDir() { if _, err = os.Stat(confDir); err != nil && confDir == getDefaultConfDir() {