Compare commits

..

2 commits

Author SHA1 Message Date
Lilian Jónsdóttir 26b6a2d349 version bump - v0.1.1
- only read identity/recipient files if none have been supplied via cli flags
2024-03-23 15:43:51 -07:00
Lilian Jónsdóttir 6550468048 only read identity/recipient files if none have been supplied via cli flags
actually this time
2024-03-23 15:43:11 -07:00
2 changed files with 14 additions and 11 deletions

View file

@ -21,7 +21,7 @@ import (
const (
name string = "agedit"
usage string = "Edit age encrypted files with your $EDITOR"
version string = "0.1.0"
version string = "0.1.1"
help_template string = `NAME:
{{.Name}} {{if .Version}}v{{.Version}}{{end}} - {{.Usage}}
@ -60,6 +60,7 @@ var (
identities = append(identities, id)
}
gave_identities = true
return nil
},
},
@ -87,6 +88,7 @@ var (
}
recipients = append(recipients, r)
}
gave_recipients = true
return nil
},
},
@ -204,7 +206,7 @@ func action(ctx *cli.Context) error {
}
// 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) {
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 {
@ -221,7 +223,7 @@ func action(ctx *cli.Context) error {
}
// 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) {
return fmt.Errorf("recipient file doesn't exist")
} else {

View file

@ -12,14 +12,15 @@ import (
)
var (
identities []age.Identity
recipients []age.Recipient
logger *log.Logger
cfg config.Config
edt editor.Editor
configFile string
input_file, output_file string
force_overwrite bool
identities []age.Identity
recipients []age.Recipient
logger *log.Logger
cfg config.Config
edt editor.Editor
configFile string
input_file, output_file string
force_overwrite bool
gave_identities, gave_recipients bool
)
func main() {