mirror of
https://github.com/syncthing/syncthing.git
synced 2025-12-23 22:18:14 -05:00
Normalize CLI options to always use two dashes. (#8037)
Consistently use double dashes and fix typos -conf, -data-dir and -verify. Applies also to tests running the syncthing binary for consistency. * Fix mismatched option name --conf in cli subcommand. According to the source code comments, the cli option flags should mirror those from the serve subcommand where applicable. That one is actually called --config though. * cli: Fix help text option placeholders. The urfave/cli package uses the Value field of StringFlag to provide a default value, not to name the placeholder. That is instead done with backticks around some part of the Usage field. * cli: Add missing --data flag in subcommand help text. The urfave/cli based option parsing uses a fake flags collection to generate help texts matching the used global options. But the --data option was omitted from it, although it is definitely required when using --config as well. Note that it cannot just be ignored, as some debug stuff actually uses the DB: syncthing cli --data=/bar --config=/foo debug index dump
This commit is contained in:
@@ -31,7 +31,7 @@ func TestCLIReset(t *testing.T) {
|
||||
|
||||
// Run reset to clean up
|
||||
|
||||
cmd := exec.Command("../bin/syncthing", "-no-browser", "-home", "h1", "-reset-database")
|
||||
cmd := exec.Command("../bin/syncthing", "--no-browser", "--home", "h1", "--reset-database")
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stdout
|
||||
err := cmd.Run()
|
||||
@@ -63,9 +63,9 @@ func TestCLIGenerate(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// -generate should create a bunch of stuff
|
||||
// --generate should create a bunch of stuff
|
||||
|
||||
cmd := exec.Command("../bin/syncthing", "-no-browser", "-generate", "home.out")
|
||||
cmd := exec.Command("../bin/syncthing", "--no-browser", "--generate", "home.out")
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stdout
|
||||
err = cmd.Run()
|
||||
@@ -91,7 +91,7 @@ func TestCLIFirstStartup(t *testing.T) {
|
||||
|
||||
// First startup should create config, BEP certificate, and HTTP certificate.
|
||||
|
||||
cmd := exec.Command("../bin/syncthing", "-no-browser", "-home", "home.out")
|
||||
cmd := exec.Command("../bin/syncthing", "--no-browser", "--home", "home.out")
|
||||
cmd.Env = append(os.Environ(), "STNORESTART=1")
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stdout
|
||||
|
||||
@@ -199,7 +199,7 @@ func TestOverrideIgnores(t *testing.T) {
|
||||
log.Println("Starting sendOnly...")
|
||||
sendOnly := syncthingProcess{ // id1
|
||||
instance: "1",
|
||||
argv: []string{"-home", "h1"},
|
||||
argv: []string{"--home", "h1"},
|
||||
port: 8081,
|
||||
apiKey: apiKey,
|
||||
}
|
||||
@@ -212,7 +212,7 @@ func TestOverrideIgnores(t *testing.T) {
|
||||
log.Println("Starting sendRecv...")
|
||||
sendRecv := syncthingProcess{ // id2
|
||||
instance: "2",
|
||||
argv: []string{"-home", "h2"},
|
||||
argv: []string{"--home", "h2"},
|
||||
port: 8082,
|
||||
apiKey: apiKey,
|
||||
}
|
||||
|
||||
@@ -542,7 +542,7 @@ func startInstance(t *testing.T, i int) *rc.Process {
|
||||
|
||||
p := rc.NewProcess(addr)
|
||||
p.LogTo(log)
|
||||
if err := p.Start("../bin/syncthing", "-home", fmt.Sprintf("h%d", i), "-no-browser"); err != nil {
|
||||
if err := p.Start("../bin/syncthing", "--home", fmt.Sprintf("h%d", i), "--no-browser"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
p.AwaitStartup()
|
||||
|
||||
Reference in New Issue
Block a user