From 2c52eca8727df744d093703bbcbd87fc39d57d30 Mon Sep 17 00:00:00 2001 From: "Joe Richey joerichey@google.com" Date: Wed, 28 Jun 2017 13:57:55 -0700 Subject: Finalize import paths and documentation This commit changes all the internal import paths from `fscrypt/foo` to `github.com/google/fscrypt/foo` so that it can be built once we release externaly. The documentation in README.md is updated accordingly. Also, the README has a note noting that we do not make any guarantees about project stability before 1.0 (when it ships with Ubuntu). Change-Id: I6ba86e442c74057c8a06ba32a42e17f94833e280 --- cmd/fscrypt/commands.go | 6 +++--- cmd/fscrypt/errors.go | 8 ++++---- cmd/fscrypt/flags.go | 3 ++- cmd/fscrypt/format.go | 2 +- cmd/fscrypt/keys.go | 8 ++++---- cmd/fscrypt/prompt.go | 4 ++-- cmd/fscrypt/protector.go | 6 +++--- cmd/fscrypt/setup.go | 2 +- cmd/fscrypt/status.go | 6 +++--- 9 files changed, 23 insertions(+), 22 deletions(-) (limited to 'cmd') diff --git a/cmd/fscrypt/commands.go b/cmd/fscrypt/commands.go index cbf62ed..7724138 100644 --- a/cmd/fscrypt/commands.go +++ b/cmd/fscrypt/commands.go @@ -28,9 +28,9 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli" - "fscrypt/actions" - "fscrypt/filesystem" - "fscrypt/metadata" + "github.com/google/fscrypt/actions" + "github.com/google/fscrypt/filesystem" + "github.com/google/fscrypt/metadata" ) // Setup is a command which can to global or per-filesystem initialization. diff --git a/cmd/fscrypt/errors.go b/cmd/fscrypt/errors.go index 272160a..c698673 100644 --- a/cmd/fscrypt/errors.go +++ b/cmd/fscrypt/errors.go @@ -31,10 +31,10 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli" - "fscrypt/actions" - "fscrypt/filesystem" - "fscrypt/metadata" - "fscrypt/util" + "github.com/google/fscrypt/actions" + "github.com/google/fscrypt/filesystem" + "github.com/google/fscrypt/metadata" + "github.com/google/fscrypt/util" ) // failureExitCode is the value fscrypt will return on failure. diff --git a/cmd/fscrypt/flags.go b/cmd/fscrypt/flags.go index da3116f..16412bf 100644 --- a/cmd/fscrypt/flags.go +++ b/cmd/fscrypt/flags.go @@ -24,13 +24,14 @@ package main import ( "flag" "fmt" - "fscrypt/actions" "log" "regexp" "strconv" "time" "github.com/urfave/cli" + + "github.com/google/fscrypt/actions" ) // We define the types boolFlag, durationFlag, and stringFlag here instead of diff --git a/cmd/fscrypt/format.go b/cmd/fscrypt/format.go index 39cc71f..ef009d3 100644 --- a/cmd/fscrypt/format.go +++ b/cmd/fscrypt/format.go @@ -32,7 +32,7 @@ import ( "github.com/urfave/cli" "golang.org/x/crypto/ssh/terminal" - "fscrypt/util" + "github.com/google/fscrypt/util" ) var ( diff --git a/cmd/fscrypt/keys.go b/cmd/fscrypt/keys.go index cecaa5b..820ddec 100644 --- a/cmd/fscrypt/keys.go +++ b/cmd/fscrypt/keys.go @@ -30,10 +30,10 @@ import ( "github.com/pkg/errors" "golang.org/x/crypto/ssh/terminal" - "fscrypt/actions" - "fscrypt/crypto" - "fscrypt/metadata" - "fscrypt/pam" + "github.com/google/fscrypt/actions" + "github.com/google/fscrypt/crypto" + "github.com/google/fscrypt/metadata" + "github.com/google/fscrypt/pam" ) // The file descriptor for standard input diff --git a/cmd/fscrypt/prompt.go b/cmd/fscrypt/prompt.go index 56dcf06..1b02280 100644 --- a/cmd/fscrypt/prompt.go +++ b/cmd/fscrypt/prompt.go @@ -28,8 +28,8 @@ import ( "strconv" "strings" - "fscrypt/actions" - "fscrypt/metadata" + "github.com/google/fscrypt/actions" + "github.com/google/fscrypt/metadata" ) const ( diff --git a/cmd/fscrypt/protector.go b/cmd/fscrypt/protector.go index e77a2e3..f54d3a4 100644 --- a/cmd/fscrypt/protector.go +++ b/cmd/fscrypt/protector.go @@ -23,9 +23,9 @@ package main import ( "log" - "fscrypt/actions" - "fscrypt/filesystem" - "fscrypt/metadata" + "github.com/google/fscrypt/actions" + "github.com/google/fscrypt/filesystem" + "github.com/google/fscrypt/metadata" ) // createProtector makes a new protector on either ctx.Mount or if the requested diff --git a/cmd/fscrypt/setup.go b/cmd/fscrypt/setup.go index 4f2375c..6433b0c 100644 --- a/cmd/fscrypt/setup.go +++ b/cmd/fscrypt/setup.go @@ -25,7 +25,7 @@ import ( "io" "os" - "fscrypt/actions" + "github.com/google/fscrypt/actions" ) // createGlobalConfig creates (or overwrites) the global config file diff --git a/cmd/fscrypt/status.go b/cmd/fscrypt/status.go index 049c370..9a8604d 100644 --- a/cmd/fscrypt/status.go +++ b/cmd/fscrypt/status.go @@ -29,9 +29,9 @@ import ( "github.com/pkg/errors" - "fscrypt/actions" - "fscrypt/filesystem" - "fscrypt/metadata" + "github.com/google/fscrypt/actions" + "github.com/google/fscrypt/filesystem" + "github.com/google/fscrypt/metadata" ) // Creates a writer which correctly aligns tabs with the specified header. -- cgit v1.2.3