celediel/agedit
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

only read identity/recipient files if none have been supplied via cli flags

Browse source 
actually this time
This commit is contained in:
Lilian Jónsdóttir 2024-03-23 15:43:11 -07:00
parent 78d3fe54b5
commit 6550468048
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/agedit/cli.go
View file

@ -60,6 +60,7 @@ var (
identities = append(identities, id) identities = append(identities, id)
} }
gave_identities = true
return nil return nil
}, },
}, },
@ -87,6 +88,7 @@ var (
} }
recipients = append(recipients, r) recipients = append(recipients, r)
} }
gave_recipients = true
return nil return nil
}, },
}, },
@ -204,7 +206,7 @@ func action(ctx *cli.Context) error {
} }
// read from identity file if exists and no identities have been supplied // read from identity file if exists and no identities have been supplied
if len(identities) == 0 { if !gave_identities {
if _, err := os.Stat(cfg.IdentityFile); os.IsNotExist(err) { if _, err := os.Stat(cfg.IdentityFile); os.IsNotExist(err) {
return fmt.Errorf("identity file unset and no identities supplied, use -i to specify an idenitity file or set one in the config file, or use -I to specify an age private key") return fmt.Errorf("identity file unset and no identities supplied, use -i to specify an idenitity file or set one in the config file, or use -I to specify an age private key")
} else { } else {
@ -221,7 +223,7 @@ func action(ctx *cli.Context) error {
} }
// read from recipient file if it exists and no recipients have been supplied // read from recipient file if it exists and no recipients have been supplied
if len(recipients) == 0 { if !gave_recipients && cfg.RecipientFile != "" {
if _, err := os.Stat(cfg.RecipientFile); os.IsNotExist(err) { if _, err := os.Stat(cfg.RecipientFile); os.IsNotExist(err) {
return fmt.Errorf("recipient file doesn't exist") return fmt.Errorf("recipient file doesn't exist")
} else { } else {

1
cmd/agedit/main.go
View file

@ -20,6 +20,7 @@ var (
configFile string configFile string
input_file, output_file string input_file, output_file string
force_overwrite bool force_overwrite bool
gave_identities, gave_recipients bool
) )
func main() { func main() {