Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Default false to all remaining options #2679

Merged
merged 2 commits into from
May 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/commands/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ order to reclaim hard disk space.
`,
},
Options: []cmds.Option{
cmds.BoolOption("quiet", "q", "Write minimal output."),
cmds.BoolOption("quiet", "q", "Write minimal output.").Default(false),
},
Run: func(req cmds.Request, res cmds.Response) {
n, err := req.InvocContext().GetNode()
Expand Down Expand Up @@ -127,7 +127,7 @@ RepoSize int Size in bytes that the repo is currently taking.
res.SetOutput(stat)
},
Options: []cmds.Option{
cmds.BoolOption("human", "Output RepoSize in MiB."),
cmds.BoolOption("human", "Output RepoSize in MiB.").Default(false),
},
Type: corerepo.Stat{},
Marshalers: cmds.MarshalerMap{
Expand Down
2 changes: 1 addition & 1 deletion core/commands/resolve.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Resolve the value of an IPFS DAG path:
cmds.StringArg("name", true, false, "The name to resolve.").EnableStdin(),
},
Options: []cmds.Option{
cmds.BoolOption("recursive", "r", "Resolve until the result is an IPFS name. Default: false."),
cmds.BoolOption("recursive", "r", "Resolve until the result is an IPFS name.").Default(false),
},
Run: func(req cmds.Request, res cmds.Response) {

Expand Down
8 changes: 4 additions & 4 deletions core/commands/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ at ~/.ipfs. To change the repo location, set the $IPFS_PATH environment variable
},
Options: []cmds.Option{
cmds.StringOption("config", "c", "Path to the configuration file to use."),
cmds.BoolOption("debug", "D", "Operate in debug mode."),
cmds.BoolOption("help", "Show the full command help text."),
cmds.BoolOption("h", "Show a short version of the command help text."),
cmds.BoolOption("local", "L", "Run the command locally, instead of using the daemon."),
cmds.BoolOption("debug", "D", "Operate in debug mode.").Default(false),
cmds.BoolOption("help", "Show the full command help text.").Default(false),
cmds.BoolOption("h", "Show a short version of the command help text.").Default(false),
cmds.BoolOption("local", "L", "Run the command locally, instead of using the daemon.").Default(false),
cmds.StringOption(ApiOption, "Use a specific API instance (defaults to /ip4/127.0.0.1/tcp/5001)"),
},
}
Expand Down
2 changes: 1 addition & 1 deletion core/commands/swarm.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ var swarmAddrsLocalCmd = &cmds.Command{
`,
},
Options: []cmds.Option{
cmds.BoolOption("id", "Show peer ID in addresses."),
cmds.BoolOption("id", "Show peer ID in addresses.").Default(false),
},
Run: func(req cmds.Request, res cmds.Response) {

Expand Down
14 changes: 7 additions & 7 deletions core/commands/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ var VersionCmd = &cmds.Command{
},

Options: []cmds.Option{
cmds.BoolOption("number", "n", "Only show the version number."),
cmds.BoolOption("commit", "Show the commit hash."),
cmds.BoolOption("repo", "Show repo version."),
cmds.BoolOption("number", "n", "Only show the version number.").Default(false),
cmds.BoolOption("commit", "Show the commit hash.").Default(false),
cmds.BoolOption("repo", "Show repo version.").Default(false),
},
Run: func(req cmds.Request, res cmds.Response) {
res.SetOutput(&VersionOutput{
Expand All @@ -47,20 +47,20 @@ var VersionCmd = &cmds.Command{
return strings.NewReader(v.Repo + "\n"), nil
}

commit, found, err := res.Request().Option("commit").Bool()
commit, _, err := res.Request().Option("commit").Bool()
commitTxt := ""
if err != nil {
return nil, err
}
if found && commit {
if commit {
commitTxt = "-" + v.Commit
}

number, found, err := res.Request().Option("number").Bool()
number, _, err := res.Request().Option("number").Bool()
if err != nil {
return nil, err
}
if found && number {
if number {
return strings.NewReader(fmt.Sprintln(v.Version + commitTxt)), nil
}

Expand Down