TrueCloudLab/restic
16
0
Fork 3
Code Issues 2 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Simpify cmd_backup and cmd_init now we have the password in gopts.

Browse source
This commit is contained in:
Pauline Middelink 2017-07-24 23:15:31 +02:00
parent d5615a67c8
commit c95e2b009e
3 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/restic/cmd_backup.go
View file

@ -249,7 +249,7 @@ func readBackupFromStdin(opts BackupOptions, gopts GlobalOptions, args []string)
return errors.Fatal("filename for backup from stdin must not be empty") return errors.Fatal("filename for backup from stdin must not be empty")
} }
if gopts.password == "" && gopts.PasswordFile == "" { if gopts.password == "" {
return errors.Fatal("unable to read password from stdin when data is to be read from stdin, use --password-file or $RESTIC_PASSWORD") return errors.Fatal("unable to read password from stdin when data is to be read from stdin, use --password-file or $RESTIC_PASSWORD")
} }
@ -322,8 +322,8 @@ func readLinesFromFile(filename string) ([]string, error) {
} }
func runBackup(opts BackupOptions, gopts GlobalOptions, args []string) error { func runBackup(opts BackupOptions, gopts GlobalOptions, args []string) error {
if opts.FilesFrom == "-" && gopts.password == "" && gopts.PasswordFile == "" { if opts.FilesFrom == "-" && gopts.password == "" {
return errors.Fatal("no password; either use `--password-file` option or put the password into the RESTIC_PASSWORD environment variable") return errors.Fatal("unable to read password from stdin when data is to be read from stdin, use --password-file or $RESTIC_PASSWORD")
} }
fromfile, err := readLinesFromFile(opts.FilesFrom) fromfile, err := readLinesFromFile(opts.FilesFrom)

12
cmd/restic/cmd_init.go
View file

@ -34,13 +34,11 @@ func runInit(gopts GlobalOptions, args []string) error {
return errors.Fatalf("create backend at %s failed: %v\n", gopts.Repo, err) return errors.Fatalf("create backend at %s failed: %v\n", gopts.Repo, err)
} }
if gopts.password == "" { gopts.password, err = ReadPasswordTwice(gopts,
gopts.password, err = ReadPasswordTwice(gopts, "enter password for new backend: ",
"enter password for new backend: ", "enter password again: ")
"enter password again: ") if err != nil {
if err != nil { return err
return err
}
} }
s := repository.New(be) s := repository.New(be)

8
cmd/restic/global.go
View file

@ -307,11 +307,9 @@ func OpenRepository(opts GlobalOptions) (*repository.Repository, error) {
s := repository.New(be) s := repository.New(be)
if opts.password == "" { opts.password, err = ReadPassword(opts, "enter password for repository: ")
opts.password, err = ReadPassword(opts, "enter password for repository: ") if err != nil {
if err != nil { return nil, err
return nil, err
}
} }
err = s.SearchKey(context.TODO(), opts.password, maxKeys) err = s.SearchKey(context.TODO(), opts.password, maxKeys)