diff --git a/shell/point/config_json_test.go b/shell/point/config_json_test.go index 6e2351a14..664f03bb5 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", "release", "config") + baseDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-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", "release", "config") + baseDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "tools", "release", "config") pointConfig, err := LoadConfig(filepath.Join(baseDir, "vpoint_vmess_freedom.json")) assert.Error(err).IsNil() diff --git a/tools/build/config.go b/tools/build/config.go index 2b7856e31..49f0e8eb3 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", "release", "config") + srcDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-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/build/go_test.go b/tools/build/go_test.go index 9f12fc8ef..3a26a52ec 100644 --- a/tools/build/go_test.go +++ b/tools/build/go_test.go @@ -28,7 +28,7 @@ func TestBuildAndRun(t *testing.T) { outBuffer := bytes.NewBuffer(make([]byte, 0, 1024)) errBuffer := bytes.NewBuffer(make([]byte, 0, 1024)) - configFile := filepath.Join(gopath, "src", "github.com", "v2ray", "v2ray-core", "release", "config", "vpoint_socks_vmess.json") + configFile := filepath.Join(gopath, "src", "github.com", "v2ray", "v2ray-core", "tools", "release", "config", "vpoint_socks_vmess.json") cmd := exec.Command(target, "--config="+configFile) cmd.Stdout = outBuffer cmd.Stderr = errBuffer diff --git a/release/config/systemd/v2ray.service b/tools/release/config/systemd/v2ray.service similarity index 100% rename from release/config/systemd/v2ray.service rename to tools/release/config/systemd/v2ray.service diff --git a/release/config/systemv/v2ray b/tools/release/config/systemv/v2ray similarity index 100% rename from release/config/systemv/v2ray rename to tools/release/config/systemv/v2ray diff --git a/release/config/vpoint_socks_vmess.json b/tools/release/config/vpoint_socks_vmess.json similarity index 100% rename from release/config/vpoint_socks_vmess.json rename to tools/release/config/vpoint_socks_vmess.json diff --git a/release/config/vpoint_vmess_freedom.json b/tools/release/config/vpoint_vmess_freedom.json similarity index 100% rename from release/config/vpoint_vmess_freedom.json rename to tools/release/config/vpoint_vmess_freedom.json