lockbox

commit 39f68027506e4765f84882bdfdaa835dcfc44190
parent dfaf9a3f279440b152f428113791e49210225dcd
Author: Sean Enck <sean@ttypty.com>
Date:   Thu, 18 May 2023 18:59:09 -0400

use helper

Diffstat:
M
cmd/vers.txt
 | 
4
++--
M
go.mod
 | 
2
+-
M
go.sum
 | 
4
++--
M
internal/app/rekey.go
 | 
6
+++---

4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cmd/vers.txt b/cmd/vers.txt
@@ -1 +1 @@
-1c6e945-1
-\ No newline at end of file
+de330ff
+\ No newline at end of file
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/aymanbagabas/go-osc52 v1.2.2
-	github.com/enckse/pgl v1.0.10
+	github.com/enckse/pgl v1.0.11
 	github.com/pquerna/otp v1.4.0
 	github.com/tobischo/gokeepasslib/v3 v3.5.1
 	mvdan.cc/sh/v3 v3.6.0
diff --git a/go.sum b/go.sum
@@ -9,8 +9,8 @@ github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyX
 github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/enckse/pgl v1.0.10 h1:UA2L4vt1yhTb3nRlSbkx6/dpmsPuW/2XKnH8/0D03aA=
-github.com/enckse/pgl v1.0.10/go.mod h1:r5bqGzwqnJIeY6UbGT5u38keJ5+ZySlsWeaYYzdBhMg=
+github.com/enckse/pgl v1.0.11 h1:2JGsmc3eZ+3P62yZNRrHejbZ+g95giGhh16sULNRQnI=
+github.com/enckse/pgl v1.0.11/go.mod h1:r5bqGzwqnJIeY6UbGT5u38keJ5+ZySlsWeaYYzdBhMg=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
diff --git a/internal/app/rekey.go b/internal/app/rekey.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"strings"
 
 	"github.com/enckse/lockbox/internal/backend"
 	"github.com/enckse/lockbox/internal/cli"
 	"github.com/enckse/lockbox/internal/inputs"
+	"github.com/enckse/pgl/types/values"
 )
 
 type (
@@ -91,8 +91,8 @@ func ReKey(cmd CommandOptions, r Keyer) error {
 		if _, err := fmt.Fprintf(writer, "rekeying: %s\n", path); err != nil {
 			return err
 		}
-		modTime := strings.TrimSpace(entry.ModTime)
-		if modTime == "" {
+		modTime, empty := values.EmptyStringTrimmed(entry.ModTime)
+		if empty {
 			return errors.New("did not read modtime")
 		}
 		var insertEnv []string