From 69d88505fd7f4cb0d9e4f1918de296342fe05858 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Mon, 23 Aug 2021 15:05:15 +0200 Subject: go mod: declare module version v2 Our git version is v2+ for some time now, but go.mod still declared v1. Hopefully making both match makes https://pkg.go.dev/github.com/rfjakob/gocryptfs/v2 work. All the import paths have been fixed like this: find . -name \*.go | xargs sed -i s%github.com/rfjakob/gocryptfs/%github.com/rfjakob/gocryptfs/v2/% --- gocryptfs-xray/paths_ctlsock.go | 2 +- gocryptfs-xray/xray_main.go | 14 +++++++------- gocryptfs-xray/xray_tests/xray_test.go | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'gocryptfs-xray') diff --git a/gocryptfs-xray/paths_ctlsock.go b/gocryptfs-xray/paths_ctlsock.go index 278916f..e0b526b 100644 --- a/gocryptfs-xray/paths_ctlsock.go +++ b/gocryptfs-xray/paths_ctlsock.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/rfjakob/gocryptfs/ctlsock" + "github.com/rfjakob/gocryptfs/v2/ctlsock" ) func decryptPaths(socketPath string, sep0 bool) { diff --git a/gocryptfs-xray/xray_main.go b/gocryptfs-xray/xray_main.go index 20c31ab..ffcd239 100644 --- a/gocryptfs-xray/xray_main.go +++ b/gocryptfs-xray/xray_main.go @@ -8,13 +8,13 @@ import ( "os" "runtime" - "github.com/rfjakob/gocryptfs/internal/configfile" - "github.com/rfjakob/gocryptfs/internal/contentenc" - "github.com/rfjakob/gocryptfs/internal/cryptocore" - "github.com/rfjakob/gocryptfs/internal/exitcodes" - "github.com/rfjakob/gocryptfs/internal/fido2" - "github.com/rfjakob/gocryptfs/internal/readpassword" - "github.com/rfjakob/gocryptfs/internal/tlog" + "github.com/rfjakob/gocryptfs/v2/internal/configfile" + "github.com/rfjakob/gocryptfs/v2/internal/contentenc" + "github.com/rfjakob/gocryptfs/v2/internal/cryptocore" + "github.com/rfjakob/gocryptfs/v2/internal/exitcodes" + "github.com/rfjakob/gocryptfs/v2/internal/fido2" + "github.com/rfjakob/gocryptfs/v2/internal/readpassword" + "github.com/rfjakob/gocryptfs/v2/internal/tlog" ) // GitVersion is the gocryptfs version according to git, set by build.bash diff --git a/gocryptfs-xray/xray_tests/xray_test.go b/gocryptfs-xray/xray_tests/xray_test.go index 2df83f2..6dc7c13 100644 --- a/gocryptfs-xray/xray_tests/xray_test.go +++ b/gocryptfs-xray/xray_tests/xray_test.go @@ -7,7 +7,7 @@ import ( "os/exec" "testing" - "github.com/rfjakob/gocryptfs/tests/test_helpers" + "github.com/rfjakob/gocryptfs/v2/tests/test_helpers" ) func TestAesgcmXray(t *testing.T) { -- cgit v1.2.3