Improved help messages for login (#59)

moul · moul · commit ec8c96b0cbf7 · 2015-06-12T14:25:43.000+02:00
diff --git a/login.go b/login.go
@@ -18,7 +18,10 @@ var cmdLogin = &Command{
 	Description: "Log in to Scaleway API",
 	Help: `Generates a configuration file in '/home/$USER/.scwrc'
 containing credentials used to interact with the Scaleway API. This
-configuration file is automatically used by the 'scw' commands.`,
+configuration file is automatically used by the 'scw' commands.
+
+You can get your credentials on https://cloud.scaleway.com/#/credentials
+`,
 }
 
 func promptUser(prompt string, output *string, echo bool) {
@@ -58,7 +61,8 @@ func runLogin(cmd *Command, args []string) {
 	}
 
 	if len(organization) == 0 {
-		promptUser("Organization: ", &organization, true)
+		fmt.Println("You can get your credentials on https://cloud.scaleway.com/#/credentials")
+		promptUser("Organization (access key): ", &organization, true)
 	}
 	if len(token) == 0 {
 		promptUser("Token: ", &token, false)

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,10 @@ var cmdLogin = &Command{`
`18`	`18`	`Description: "Log in to Scaleway API",`
`19`	`19`	Help: `Generates a configuration file in '/home/$USER/.scwrc'
`20`	`20`	`containing credentials used to interact with the Scaleway API. This`
`21`		-configuration file is automatically used by the 'scw' commands.`,
	`21`	`+configuration file is automatically used by the 'scw' commands.`
	`22`	`+`
	`23`	`+You can get your credentials on https://cloud.scaleway.com/#/credentials`
	`24`	+`,
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`func promptUser(prompt string, output *string, echo bool) {`
`@@ -58,7 +61,8 @@ func runLogin(cmd *Command, args []string) {`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`if len(organization) == 0 {`
`61`		`- promptUser("Organization: ", &organization, true)`
	`64`	`+ fmt.Println("You can get your credentials on https://cloud.scaleway.com/#/credentials")`
	`65`	`+ promptUser("Organization (access key): ", &organization, true)`
`62`	`66`	`}`
`63`	`67`	`if len(token) == 0 {`
`64`	`68`	`promptUser("Token: ", &token, false)`