From 462fde5e7d48128a92524a1fd63e890bcb6a9a80 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Tue, 22 Nov 2016 08:18:43 +0000 Subject: [PATCH] cmd/syncthing: Make the default folder default again The current way is quite confusing for new users - we create a default folder, but it's not usable with the default folder created somewhere else. Instead, when setting up for the first time with two devices, the default folder must be removed and recreated on one of them. This comes up on IRC and the forum now and then. I think this matches expectactions better. Another alternative would be to remove it entirely (not create a default folder), but then we should also add some guidance in the UI on how to proceed. GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3751 --- cmd/syncthing/main.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index f61f90bc..9ecb46fe 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -955,9 +955,8 @@ func defaultConfig(myName string) config.Configuration { if !noDefaultFolder { l.Infoln("Default folder created and/or linked to new config") - folderID := strings.ToLower(rand.String(5) + "-" + rand.String(5)) - defaultFolder = config.NewFolderConfiguration(folderID, locations[locDefFolder]) - defaultFolder.Label = "Default Folder (" + folderID + ")" + defaultFolder = config.NewFolderConfiguration("default", locations[locDefFolder]) + defaultFolder.Label = "Default Folder" defaultFolder.RescanIntervalS = 60 defaultFolder.MinDiskFreePct = 1 defaultFolder.Devices = []config.FolderDeviceConfiguration{{DeviceID: myID}}