From fdeb8b4f89b2eeccb8636e851b6f5e7c716b5f18 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Sat, 20 Aug 2016 21:03:50 +0200 Subject: [PATCH] update file paths --- shell/point/config_json_test.go | 4 ++-- testing/scenarios/server_env.go | 4 ++-- tools/build/config.go | 2 +- tools/git/git.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/shell/point/config_json_test.go b/shell/point/config_json_test.go index f1ebc646..199c8469 100644 --- a/shell/point/config_json_test.go +++ b/shell/point/config_json_test.go @@ -18,7 +18,7 @@ func TestClientSampleConfig(t *testing.T) { assert := assert.On(t) GOPATH := os.Getenv("GOPATH") - baseDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "tools", "release", "config") + baseDir := filepath.Join(GOPATH, "src", "v2ray.com", "core", "tools", "release", "config") pointConfig, err := LoadConfig(filepath.Join(baseDir, "vpoint_socks_vmess.json")) assert.Error(err).IsNil() @@ -38,7 +38,7 @@ func TestServerSampleConfig(t *testing.T) { assert := assert.On(t) GOPATH := os.Getenv("GOPATH") - baseDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "tools", "release", "config") + baseDir := filepath.Join(GOPATH, "src", "v2ray.com", "core", "tools", "release", "config") pointConfig, err := LoadConfig(filepath.Join(baseDir, "vpoint_vmess_freedom.json")) assert.Error(err).IsNil() diff --git a/testing/scenarios/server_env.go b/testing/scenarios/server_env.go index 7a1fd623..204e41db 100644 --- a/testing/scenarios/server_env.go +++ b/testing/scenarios/server_env.go @@ -34,11 +34,11 @@ func GetTestBinaryPath() string { } func GetSourcePath() string { - return filepath.Join("github.com", "v2ray", "v2ray-core", "shell", "point", "main") + return filepath.Join("v2ray.com", "core", "shell", "point", "main") } func TestFile(filename string) string { - return filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "v2ray", "v2ray-core", "testing", "scenarios", "data", filename) + return filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "testing", "scenarios", "data", filename) } func InitializeServerSetOnce(testcase string) error { diff --git a/tools/build/config.go b/tools/build/config.go index 49f0e8eb..87362ac5 100644 --- a/tools/build/config.go +++ b/tools/build/config.go @@ -25,7 +25,7 @@ func copyConfigFile(src, dest string, goOS GoOS, format bool) error { func copyConfigFiles(dir string, goOS GoOS) error { GOPATH := os.Getenv("GOPATH") - srcDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "tools", "release", "config") + srcDir := filepath.Join(GOPATH, "src", "v2ray.com", "core", "tools", "release", "config") src := filepath.Join(srcDir, "vpoint_socks_vmess.json") dest := filepath.Join(dir, "vpoint_socks_vmess.json") if goOS == Windows || goOS == MacOS { diff --git a/tools/git/git.go b/tools/git/git.go index 964ed43a..c544116b 100644 --- a/tools/git/git.go +++ b/tools/git/git.go @@ -13,7 +13,7 @@ const ( func getRepoRoot() string { GOPATH := os.Getenv("GOPATH") - return filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core") + return filepath.Join(GOPATH, "src", "v2ray.com", "core") } func RevParse(args ...string) (string, error) {