docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1322 from calavera/prompt_without_defaults 

Do not show empty parenthesis if the default configuration is missing.
This commit is contained in:
Guillaume J. Charmes 2013-07-29 10:53:43 -07:00
parent 97a2dc96f2 88b6ea993d
commit 950d0312dc
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
commands.go
View File

@ -314,13 +314,21 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
email string email string
) )
var promptDefault = func(prompt string, configDefault string) {
if configDefault == "" {
fmt.Fprintf(cli.out, "%s: ", prompt)
} else {
fmt.Fprintf(cli.out, "%s (%s): ", prompt, configDefault)
}
}
authconfig, ok := cli.configFile.Configs[auth.IndexServerAddress()] authconfig, ok := cli.configFile.Configs[auth.IndexServerAddress()]
if !ok { if !ok {
authconfig = auth.AuthConfig{} authconfig = auth.AuthConfig{}
} }
if *flUsername == "" { if *flUsername == "" {
fmt.Fprintf(cli.out, "Username (%s): ", authconfig.Username) promptDefault("Username", authconfig.Username)
username = readAndEchoString(cli.in, cli.out) username = readAndEchoString(cli.in, cli.out)
if username == "" { if username == "" {
username = authconfig.Username username = authconfig.Username
@ -340,7 +348,7 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
} }
if *flEmail == "" { if *flEmail == "" {
fmt.Fprintf(cli.out, "Email (%s): ", authconfig.Email) promptDefault("Email", authconfig.Email)
email = readAndEchoString(cli.in, cli.out) email = readAndEchoString(cli.in, cli.out)
if email == "" { if email == "" {
email = authconfig.Email email = authconfig.Email