lockbox

commit 824324b5d3236ee2d13c2427154c5b9a741b88f0
parent 2cda9680208ab8e7618ca7be298ba8971f03e10f
Author: Sean Enck <sean@ttypty.com>
Date:   Sat,  4 Mar 2023 17:36:17 -0500

lib path updates

Diffstat:
M
cmd/main.go
 | 
4
++--
M
go.mod
 | 
2
+-
M
go.sum
 | 
4
++--
M
internal/app/core.go
 | 
4
++--
M
internal/inputs/stdin.go
 | 
6
+++---
M
scripts/testing/check.go
 | 
10
+++++-----

6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/cmd/main.go b/cmd/main.go
@@ -15,7 +15,7 @@ import (
 	"github.com/enckse/lockbox/internal/inputs"
 	"github.com/enckse/lockbox/internal/platform"
 	"github.com/enckse/lockbox/internal/totp"
-	o "github.com/enckse/pgl/os"
+	"github.com/enckse/pgl/exit"
 )
 
 //go:embed "vers.txt"
@@ -23,7 +23,7 @@ var version string
 
 func main() {
 	if err := run(); err != nil {
-		o.Die(err)
+		exit.Die(err)
 	}
 }
 
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 v0.0.0-20230304221611-426e9e4c7e88
+	github.com/enckse/pgl v0.0.0-20230304223125-7f35f3d67761
 	github.com/pquerna/otp v1.4.0
 	github.com/tobischo/gokeepasslib/v3 v3.5.0
 	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 v0.0.0-20230304221611-426e9e4c7e88 h1:hiEvVPHGcFo+jhLfaTaW+A68xo5hjlXFAoM29JzpAXw=
-github.com/enckse/pgl v0.0.0-20230304221611-426e9e4c7e88/go.mod h1:r5bqGzwqnJIeY6UbGT5u38keJ5+ZySlsWeaYYzdBhMg=
+github.com/enckse/pgl v0.0.0-20230304223125-7f35f3d67761 h1:oGyysxC73TMSmywOFL324VcQ1hYqEJr1voDEmFWC/hE=
+github.com/enckse/pgl v0.0.0-20230304223125-7f35f3d67761/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/core.go b/internal/app/core.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/enckse/lockbox/internal/backend"
 	"github.com/enckse/lockbox/internal/inputs"
-	o "github.com/enckse/pgl/os"
+	"github.com/enckse/pgl/exit"
 )
 
 type (
@@ -54,7 +54,7 @@ func (a *DefaultCommand) Transaction() *backend.Transaction {
 func (a *DefaultCommand) Confirm(prompt string) bool {
 	yesNo, err := inputs.ConfirmYesNoPrompt(prompt)
 	if err != nil {
-		o.Dief("failed to read stdin for confirmation: %v", err)
+		exit.Dief("failed to read stdin for confirmation: %v", err)
 	}
 	return yesNo
 }
diff --git a/internal/inputs/stdin.go b/internal/inputs/stdin.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/enckse/pgl/io"
+	"github.com/enckse/pgl/stdin"
 )
 
 func termEcho(on bool) {
@@ -89,9 +89,9 @@ func Stdin(one bool) (string, error) {
 	var b []byte
 	var err error
 	if one {
-		b, err = io.ReadStdinLine()
+		b, err = stdin.ReadLine()
 	} else {
-		b, err = io.ReadAllStdin()
+		b, err = stdin.ReadAll()
 	}
 	if err != nil {
 		return "", err
diff --git a/scripts/testing/check.go b/scripts/testing/check.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
-	fp "github.com/enckse/pgl/filepath"
-	o "github.com/enckse/pgl/os"
+	"github.com/enckse/pgl/exit"
+	"github.com/enckse/pgl/paths"
 )
 
 var yes = []string{"y"}
@@ -27,7 +27,7 @@ func runCommand(args []string, data []string) {
 	var buf bytes.Buffer
 	for _, d := range data {
 		if _, err := buf.WriteString(fmt.Sprintf("%s\n", d)); err != nil {
-			o.Dief("failed to write stdin: %v", err)
+			exit.Dief("failed to write stdin: %v", err)
 		}
 	}
 	p.Stdout = os.Stdout
@@ -60,7 +60,7 @@ func totpList() {
 
 func main() {
 	if err := execute(); err != nil {
-		o.Die(err)
+		exit.Die(err)
 	}
 }
 
@@ -211,7 +211,7 @@ func testClipboard(dataPath string, tries uint, wait uint) {
 		}
 		foundClipCount := 0
 		for _, f := range clipFiles {
-			if fp.PathExists(f) {
+			if paths.Exists(f) {
 				foundClipCount++
 			}
 		}