rdelaage
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'fw42/rename_change_to_passwd'

This commit is contained in:
Alexander Neumann 2015-04-25 11:11:27 +02:00
parent fd472cb59d dead2b7e93
commit 87a1946417
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/restic/cmd_key.go
View File

@ -114,7 +114,7 @@ func changePassword(s restic.Server) error {
} }
func (cmd CmdKey) Usage() string { func (cmd CmdKey) Usage() string {
return "[list|add|rm|change] [ID]" return "[list|add|rm|passwd] [ID]"
} }
func (cmd CmdKey) Execute(args []string) error { func (cmd CmdKey) Execute(args []string) error {
@ -139,7 +139,7 @@ func (cmd CmdKey) Execute(args []string) error {
} }
return deleteKey(s, id) return deleteKey(s, id)
case "change": case "passwd":
return changePassword(s) return changePassword(s)
} }

4
testsuite/test-key-add-remove.sh
View File

@ -15,9 +15,9 @@ unset RESTIC_PASSWORD
RESTIC_PASSWORD=foo run restic init RESTIC_PASSWORD=foo run restic init
RESTIC_PASSWORD=foo run restic key list RESTIC_PASSWORD=foo run restic key list
RESTIC_PASSWORD=foo RESTIC_NEWPASSWORD=foobar run restic key change RESTIC_PASSWORD=foo RESTIC_NEWPASSWORD=foobar run restic key passwd
RESTIC_PASSWORD=foobar run restic key list RESTIC_PASSWORD=foobar run restic key list
RESTIC_PASSWORD=foobar RESTIC_NEWPASSWORD=foo run restic key change RESTIC_PASSWORD=foobar RESTIC_NEWPASSWORD=foo run restic key passwd
OLD_PWD=foo OLD_PWD=foo
for i in {1..3}; do for i in {1..3}; do