Merge pull request #640 from twpayne/trim-space

Strip leading and trailing space from values read from user

cmd/config.go

@@ -491,7 +491,7 @@ func (c *Config) prompt(s, choices string) (byte, error) {
 		if err != nil {
 			return 0, err
 		}
-		line = strings.TrimRight(line, "\r\n")
+		line = strings.TrimSpace(line)
 		if len(line) == 1 && strings.IndexByte(choices, line[0]) != -1 {
 			return line[0], nil
 		}

cmd/init.go

@@ -177,5 +177,5 @@ func (c *Config) promptString(field string) string {
 	fmt.Fprintf(c.Stdout, "%s? ", field)
 	value, err := bufio.NewReader(c.Stdin).ReadString('\n')
 	panicOnError(err)
-	return strings.TrimRight(value, "\r\n")
+	return strings.TrimSpace(value)
 }

docs/REFERENCE.md

@@ -971,8 +971,8 @@ the same *pass-name* will only invoke `pass` once.
 ### `promptString` *prompt*
 
 `promptString` takes a single argument is a string prompted to the user, and the
-return value is the user's response to that prompt. It is only available when
-generating the initial config file.
+return value is the user's response to that prompt with all leading and trailing
+space stripped. It is only available when generating the initial config file.
 
 #### `promptString` examples