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

Hide temporary files on Windows (fixes #146)

Browse Source
This commit is contained in:
Jakob Borg
2014-04-22 14:26:51 +02:00
parent 90d0896848
commit 35ebdc76ff
4 changed files with 75 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/syncthing/main.go
View File

@@ -580,11 +580,13 @@ func getDefaultConfDir() string {
switch runtime.GOOS {
case "windows":
return filepath.Join(os.Getenv("AppData"), "Syncthing")
case "darwin":
return expandTilde("~/Library/Application Support/Syncthing")
default:
if xdgCfg := os.Getenv("XDG_CONFIG_HOME"); xdgCfg != "" {
return xdgCfg + "/syncthing"
return filepath.Join(xdgCfg, "syncthing")
} else {
return expandTilde("~/.config/syncthing")
}
@@ -592,17 +594,11 @@ func getDefaultConfDir() string {
}
func expandTilde(p string) string {
if !strings.HasPrefix(p, "~/") {
if runtime.GOOS == "windows" || !strings.HasPrefix(p, "~/") {
return p
}
switch runtime.GOOS {
case "windows":
return p
default:
return filepath.Join(getHomeDir(), p[2:])
}
return filepath.Join(getHomeDir(), p[2:])
}
func getHomeDir() string {
@@ -610,7 +606,7 @@ func getHomeDir() string {
switch runtime.GOOS {
case "windows":
home = os.Getenv("HomeDrive") + os.Getenv("HomePath")
home = filepath.Join(os.Getenv("HomeDrive"), os.Getenv("HomePath"))
if home == "" {
home = os.Getenv("UserProfile")
}