From c7d03758e7642dd11101887c1879aff4b402ba7b Mon Sep 17 00:00:00 2001 From: atang152 Date: Wed, 17 Apr 2019 23:45:49 +0800 Subject: [PATCH] move /internal/pathutil to /pkg/util/pathutil as per https://github.com/skycoin/skywire-updater/pull/7#pullrequestreview-227368978 --- cmd/manager-node/commands/gen-config.go | 2 +- cmd/manager-node/commands/root.go | 2 +- cmd/skywire-cli/commands/node/gen-config.go | 2 +- cmd/skywire-node/commands/root.go | 2 +- pkg/manager/config.go | 2 +- {internal => pkg/util}/pathutil/configpath.go | 0 {internal => pkg/util}/pathutil/homedir.go | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename {internal => pkg/util}/pathutil/configpath.go (100%) rename {internal => pkg/util}/pathutil/homedir.go (100%) diff --git a/cmd/manager-node/commands/gen-config.go b/cmd/manager-node/commands/gen-config.go index 39ab4a1df6..94e203b598 100644 --- a/cmd/manager-node/commands/gen-config.go +++ b/cmd/manager-node/commands/gen-config.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "github.com/skycoin/skywire/internal/pathutil" + "github.com/skycoin/skywire/pkg/util/pathutil" "github.com/spf13/cobra" diff --git a/cmd/manager-node/commands/root.go b/cmd/manager-node/commands/root.go index fd1ab2e57b..b52e6fbb0e 100644 --- a/cmd/manager-node/commands/root.go +++ b/cmd/manager-node/commands/root.go @@ -9,8 +9,8 @@ import ( "github.com/skycoin/skycoin/src/util/logging" "github.com/spf13/cobra" - "github.com/skycoin/skywire/internal/pathutil" "github.com/skycoin/skywire/pkg/manager" + "github.com/skycoin/skywire/pkg/util/pathutil" ) const configEnv = "SW_MANAGER_CONFIG" diff --git a/cmd/skywire-cli/commands/node/gen-config.go b/cmd/skywire-cli/commands/node/gen-config.go index 220b572574..b78940c4ef 100644 --- a/cmd/skywire-cli/commands/node/gen-config.go +++ b/cmd/skywire-cli/commands/node/gen-config.go @@ -7,9 +7,9 @@ import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire/internal/pathutil" "github.com/skycoin/skywire/pkg/cipher" "github.com/skycoin/skywire/pkg/node" + "github.com/skycoin/skywire/pkg/util/pathutil" ) func init() { diff --git a/cmd/skywire-node/commands/root.go b/cmd/skywire-node/commands/root.go index b7e6403647..a67c8fb4ea 100644 --- a/cmd/skywire-node/commands/root.go +++ b/cmd/skywire-node/commands/root.go @@ -12,8 +12,8 @@ import ( "github.com/spf13/cobra" - "github.com/skycoin/skywire/internal/pathutil" "github.com/skycoin/skywire/pkg/node" + "github.com/skycoin/skywire/pkg/util/pathutil" ) const configEnv = "SW_CONFIG" diff --git a/pkg/manager/config.go b/pkg/manager/config.go index 681c3e9fa9..228bbd37eb 100644 --- a/pkg/manager/config.go +++ b/pkg/manager/config.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - "github.com/skycoin/skywire/internal/pathutil" + "github.com/skycoin/skywire/pkg/util/pathutil" "github.com/skycoin/skywire/pkg/cipher" ) diff --git a/internal/pathutil/configpath.go b/pkg/util/pathutil/configpath.go similarity index 100% rename from internal/pathutil/configpath.go rename to pkg/util/pathutil/configpath.go diff --git a/internal/pathutil/homedir.go b/pkg/util/pathutil/homedir.go similarity index 100% rename from internal/pathutil/homedir.go rename to pkg/util/pathutil/homedir.go