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

Expand ~/ on Windows as well

Browse Source
This commit is contained in:
Jakob Borg 2014-05-24 13:22:09 +02:00
parent ed07fc0f2c
commit 8661afcb4f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/syncthing/gui.go
View File

@ -244,7 +244,7 @@ func restGetSystem(w http.ResponseWriter) {
res["goroutines"] = runtime.NumGoroutine() res["goroutines"] = runtime.NumGoroutine()
res["alloc"] = m.Alloc res["alloc"] = m.Alloc
res["sys"] = m.Sys res["sys"] = m.Sys
res["tilde"] = expandTilde("~/") res["tilde"] = expandTilde("~")
if cfg.Options.GlobalAnnEnabled && discoverer != nil { if cfg.Options.GlobalAnnEnabled && discoverer != nil {
res["extAnnounceOK"] = discoverer.ExtAnnounceOK() res["extAnnounceOK"] = discoverer.ExtAnnounceOK()
} }

6
cmd/syncthing/main.go
View File

@ -679,7 +679,11 @@ func getDefaultConfDir() string {
} }
func expandTilde(p string) string { func expandTilde(p string) string {
if runtime.GOOS == "windows" || !strings.HasPrefix(p, "~/") { if p == "~" {
return getHomeDir()
}
if !strings.HasPrefix(p, fmt.Sprintf("~%c", os.PathSeparator)) {
return p return p
} }