mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-28 09:13:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use go1.13 compatible way to read files

Browse source
This commit is contained in:
Till Faelligen 2021-06-07 20:25:02 +02:00
parent 70c43bcb2e
commit addb25e7f4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/create-account/main.go
View file

@ -19,6 +19,7 @@ import (
"flag" "flag"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"strings" "strings"
"syscall" "syscall"
@ -101,7 +102,7 @@ func getPassword(password, pwdFile *string, pwdStdin, askPass *bool, r io.Reader
// read password from file // read password from file
if pwdFile != nil && *pwdFile != "" { if pwdFile != nil && *pwdFile != "" {
pw, err := os.ReadFile(*pwdFile) pw, err := ioutil.ReadFile(*pwdFile)
if err != nil { if err != nil {
logrus.Fatalln("Unable to read password from file:", err) logrus.Fatalln("Unable to read password from file:", err)
} }
@ -110,7 +111,7 @@ func getPassword(password, pwdFile *string, pwdStdin, askPass *bool, r io.Reader
// read password from stdin // read password from stdin
if pwdStdin != nil && *pwdStdin { if pwdStdin != nil && *pwdStdin {
data, err := io.ReadAll(r) data, err := ioutil.ReadAll(r)
if err != nil { if err != nil {
logrus.Fatalln("Unable to read password from stdin:", err) logrus.Fatalln("Unable to read password from stdin:", err)
} }