Merge branch 'master' into default-pub-from-private

Paul Schroeder · Paul Schroeder · commit 6b1f1db8640c · 2023-06-05T22:24:15.000+02:00
diff --git a/cmd/add.go b/cmd/add.go
@@ -51,14 +51,14 @@ func Add() *cobra.Command {
 				publicKeyFileName = privateKeyFileName + ".pub"
 			}
 
-			publicKey, err := readFile(publicKeyFileName)
+			privateKey, err := readFile(privateKeyFileName)
 			if err != nil {
 				return err
 			}
 
-			privateKey, err := readFile(privateKeyFileName)
+			publicKey, err := readFile(publicKeyFileName)
 			if err != nil {
-				return err
+				publicKey = privateKey + ".pub"
 			}
 
 			item := provider.Item{

Original file line number	Diff line number	Diff line change
`@@ -51,14 +51,14 @@ func Add() *cobra.Command {`
`51`	`51`	`publicKeyFileName = privateKeyFileName + ".pub"`
`52`	`52`	`}`
`53`	`53`
`54`		`- publicKey, err := readFile(publicKeyFileName)`
	`54`	`+ privateKey, err := readFile(privateKeyFileName)`
`55`	`55`	`if err != nil {`
`56`	`56`	`return err`
`57`	`57`	`}`
`58`	`58`
`59`		`- privateKey, err := readFile(privateKeyFileName)`
	`59`	`+ publicKey, err := readFile(publicKeyFileName)`
`60`	`60`	`if err != nil {`
`61`		`- return err`
	`61`	`+ publicKey = privateKey + ".pub"`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`item := provider.Item{`