feat: sign --detach --ascii

Author: calmh

internal/pgp/pgp.go

@@ -38,17 +38,17 @@ type Seekable interface {
 	io.Seeker
 }
 
-func (s *Signer) DetachSign(in Seekable, out io.Writer) error {
+func (s *Signer) DetachSign(in Seekable, out io.Writer, asciiArmour bool) error {
 	if len(s.entities) == 0 {
 		return fmt.Errorf("no entities")
 	}
 	cfg := &packet.Config{
 		DefaultHash: crypto.SHA256,
 	}
-	if err := openpgp.DetachSign(out, s.entities, in, cfg); err != nil {
-		return err
+	if asciiArmour {
+		return openpgp.ArmoredDetachSign(out, s.entities, in, &openpgp.SignParams{Config: cfg})
 	}
-	return nil
+	return openpgp.DetachSign(out, s.entities, in, cfg)
 }
 
 func (s *Signer) ClearSign(in Seekable, out io.Writer) error {

internal/publish/release.go

@@ -156,7 +156,7 @@ func signRelease(dist string, s *pgp.Signer) error {
 	if err != nil {
 		return err
 	}
-	if err := s.DetachSign(in, out); err != nil {
+	if err := s.DetachSign(in, out, false); err != nil {
 		return err
 	}
 	if err := out.Close(); err != nil {

internal/sign/publish.go

@@ -10,6 +10,8 @@ import (
 type CLI struct {
 	Files []string `arg:"" help:"Files to sign" type:"existingfile" env:"EZAPT_FILES"`
 	pgp.CLI
+	Detach bool `help:"Detach signature" env:"EZAPT_DETACH"`
+	ASCII  bool `help:"ASCII armor" env:"EZAPT_ASCII"`
 }
 
 func (c *CLI) Run() error {
@@ -28,7 +30,12 @@ func (c *CLI) Run() error {
 		if err != nil {
 			return fmt.Errorf("create: %w", err)
 		}
-		if err := sign.ClearSign(in, out); err != nil {
+		if c.Detach {
+			err = sign.DetachSign(in, out, c.ASCII)
+		} else {
+			err = sign.ClearSign(in, out)
+		}
+		if err != nil {
 			return fmt.Errorf("sign: %w", err)
 		}
 		if err := out.Close(); err != nil {