|
|
@@ -248,6 +248,12 @@ func main() {
|
|
|
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") != "" {
|
|
|
syncthingMain()
|
|
|
} else {
|
|
|
@@ -266,8 +272,6 @@ func syncthingMain() {
|
|
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
|
|
}
|
|
|
|
|
|
- confDir = expandTilde(confDir)
|
|
|
-
|
|
|
events.Default.Log(events.Starting, map[string]string{"home": confDir})
|
|
|
|
|
|
if _, err = os.Stat(confDir); err != nil && confDir == getDefaultConfDir() {
|