release script relocation

derek964 · Dec 25, 2017 · a82ca01 · a82ca01
1 parent e8cad4a
commit a82ca01
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 7 deletions.
diff --git a/app/router/condition_test.go b/app/router/condition_test.go
@@ -211,7 +211,7 @@ func loadGeoSite(country string) ([]*Domain, error) {
 func TestChinaSites(t *testing.T) {
 	assert := With(t)
 
-	common.Must(sysio.CopyFile(platform.GetAssetLocation("geosite.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "tools", "release", "config", "geosite.dat")))
+	common.Must(sysio.CopyFile(platform.GetAssetLocation("geosite.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "release", "config", "geosite.dat")))
 
 	domains, err := loadGeoSite("CN")
 	assert(err, IsNil)

diff --git a/common/net/ipnet_test.go b/common/net/ipnet_test.go
@@ -54,7 +54,7 @@ func TestIPNet(t *testing.T) {
 
 func TestGeoIPCN(t *testing.T) {
 	assert := With(t)
-	common.Must(sysio.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "tools", "release", "config", "geoip.dat")))
+	common.Must(sysio.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "release", "config", "geoip.dat")))
 
 	ips, err := loadGeoIP("CN")
 	common.Must(err)
@@ -87,7 +87,7 @@ func loadGeoIP(country string) ([]*router.CIDR, error) {
 }
 
 func BenchmarkIPNetQuery(b *testing.B) {
-	common.Must(sysio.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "tools", "release", "config", "geoip.dat")))
+	common.Must(sysio.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "release", "config", "geoip.dat")))
 
 	ips, err := loadGeoIP("CN")
 	common.Must(err)
@@ -105,7 +105,7 @@ func BenchmarkIPNetQuery(b *testing.B) {
 }
 
 func BenchmarkCIDRQuery(b *testing.B) {
-	common.Must(sysio.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "tools", "release", "config", "geoip.dat")))
+	common.Must(sysio.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "release", "config", "geoip.dat")))
 
 	ips, err := loadGeoIP("CN")
 	common.Must(err)

diff --git a/tools/release/config/geoip.dat → release/config/geoip.dat b/tools/release/config/geoip.dat → release/config/geoip.dat
diff --git a/tools/release/config/geosite.dat → release/config/geosite.dat b/tools/release/config/geosite.dat → release/config/geosite.dat
diff --git a/tools/release/config/systemd/v2ray.service → release/config/systemd/v2ray.service b/tools/release/config/systemd/v2ray.service → release/config/systemd/v2ray.service
diff --git a/tools/release/config/systemv/v2ray → release/config/systemv/v2ray b/tools/release/config/systemv/v2ray → release/config/systemv/v2ray
diff --git a/tools/release/config/vpoint_socks_vmess.json → release/config/vpoint_socks_vmess.json b/tools/release/config/vpoint_socks_vmess.json → release/config/vpoint_socks_vmess.json
diff --git a/.../release/config/vpoint_vmess_freedom.json → release/config/vpoint_vmess_freedom.json b/.../release/config/vpoint_vmess_freedom.json → release/config/vpoint_vmess_freedom.json
diff --git a/tools/release/doc/readme.md → release/doc/readme.md b/tools/release/doc/readme.md → release/doc/readme.md
@@ -29,7 +29,7 @@ v2ray --config=<full path>
 
 压缩包中的 .sig 文件为 GPG 签名文件，用来验证对应程序文件的真实性。签名公钥可以在下面的链接找到：
 
-https://github.com/v2ray/v2ray-core/blob/master/tools/release/verify/official_release.asc
+https://github.com/v2ray/v2ray-core/blob/master/release/verify/official_release.asc
 
 ## 问题反馈
 

diff --git a/tools/release/make-release.sh → release/make-release.sh b/tools/release/make-release.sh → release/make-release.sh
diff --git a/tools/release/release-ci.sh → release/release-ci.sh b/tools/release/release-ci.sh → release/release-ci.sh
diff --git a/tools/release/verify/official_release.asc → release/verify/official_release.asc b/tools/release/verify/official_release.asc → release/verify/official_release.asc
diff --git a/tools/tools.go b/tools/tools.go