roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

cmd/utils: fix --password on Windows

Browse Source 
Text files created on Windows typically have \r\n line endings.
Trim them when reading password files.
This commit is contained in:
Felix Lange 2016-03-30 23:20:06 +02:00
parent aca9d6a1fb
commit ea005a0295
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/utils/flags.go
View File

@ -606,17 +606,22 @@ func MakeMinerExtra(extra []byte, ctx *cli.Context) []byte {
return extra return extra
} }
// MakePasswordList loads up a list of password from a file specified by the // MakePasswordList reads password lines from the file specified by --password.
// command line flags.
func MakePasswordList(ctx *cli.Context) []string { func MakePasswordList(ctx *cli.Context) []string {
if path := ctx.GlobalString(PasswordFileFlag.Name); path != "" { path := ctx.GlobalString(PasswordFileFlag.Name)
blob, err := ioutil.ReadFile(path) if path == "" {
if err != nil { return nil
Fatalf("Failed to read password file: %v", err)
}
return strings.Split(string(blob), "\n")
} }
return nil text, err := ioutil.ReadFile(path)
if err != nil {
Fatalf("Failed to read password file: %v", err)
}
lines := strings.Split(string(text), "\n")
// Sanitise DOS line endings.
for i := range lines {
lines[i] = strings.TrimRight(lines[i], "\r")
}
return lines
} }
// MakeSystemNode sets up a local node, configures the services to launch and // MakeSystemNode sets up a local node, configures the services to launch and