From 1ff5fc9620e07a53c2932a1fee111d1efda2ef49 Mon Sep 17 00:00:00 2001 From: Audrius Butkevicius Date: Wed, 28 Mar 2018 18:02:43 +0100 Subject: [PATCH] cmd/syncthing: Correct --paths in some cases (#4845) --- cmd/syncthing/main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 6c7a4cfc4..d0fab3a8a 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -383,7 +383,7 @@ func main() { } if options.showPaths { - showPaths() + showPaths(options) return } @@ -1318,13 +1318,13 @@ func checkShortIDs(cfg *config.Wrapper) error { return nil } -func showPaths() { +func showPaths(options RuntimeOptions) { fmt.Printf("Configuration file:\n\t%s\n\n", locations[locConfigFile]) fmt.Printf("Database directory:\n\t%s\n\n", locations[locDatabase]) fmt.Printf("Device private key & certificate files:\n\t%s\n\t%s\n\n", locations[locKeyFile], locations[locCertFile]) fmt.Printf("HTTPS private key & certificate files:\n\t%s\n\t%s\n\n", locations[locHTTPSKeyFile], locations[locHTTPSCertFile]) - fmt.Printf("Log file:\n\t%s\n\n", locations[locLogFile]) - fmt.Printf("GUI override directory:\n\t%s\n\n", locations[locGUIAssets]) + fmt.Printf("Log file:\n\t%s\n\n", options.logFile) + fmt.Printf("GUI override directory:\n\t%s\n\n", options.assetDir) fmt.Printf("Default sync folder directory:\n\t%s\n\n", locations[locDefFolder]) }