Просмотр исходного кода

cmd/syncthing: Correct --paths in some cases (#4845)

Audrius Butkevicius 7 лет назад
Родитель
Сommit
1ff5fc9620
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      cmd/syncthing/main.go

+ 4 - 4
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])
 }