diff options
author | Zhang Hua | 2023-06-29 16:50:44 +0800 |
---|---|---|
committer | Zhang Hua | 2023-06-29 16:52:01 +0800 |
commit | 80ebc2c84380cc006dd76b1f2cd2ba3226742cda (patch) | |
tree | 9e23972e2bf831de4267d90036a111bf218fdda9 | |
parent | 865088687dc81f868cfe3c3e4d174b075fab833a (diff) | |
download | aur-80ebc2c84380cc006dd76b1f2cd2ba3226742cda.tar.gz |
Bump to 2.2.4
Add .SRCINFO
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | .gitignore | 6 | ||||
-rw-r--r-- | PKGBUILD | 24 | ||||
-rw-r--r-- | patch.patch | 128 |
4 files changed, 17 insertions, 150 deletions
@@ -1,16 +1,13 @@ pkgbase = cloudflarespeedtest pkgdesc = Cloudflare IP Batch Test Tool - pkgver = 2.0.3 + pkgver = 2.2.4 pkgrel = 1 url = https://github.com/XIU2/CloudflareSpeedTest arch = x86_64 license = GPL3 makedepends = go - conflicts = cloudflarespeedtest - source = https://github.com/XIU2/CloudflareSpeedTest/archive/v2.0.3.tar.gz - source = patch.patch - sha256sums = SKIP + makedepends = git + source = git+https://github.com/XIU2/CloudflareSpeedTest.git#tag=v2.2.4 sha256sums = SKIP pkgname = cloudflarespeedtest - diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..68c8db77b042 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +pkg +src +*.pkg.tar.* +CloudflareSpeedTest +*.log + @@ -1,32 +1,24 @@ # Maintainer: Tom Yang <tomyangsh at icloud dot com> pkgname=cloudflarespeedtest -pkgver=2.0.3 +pkgver=2.2.4 pkgrel=1 license=('GPL3') pkgdesc="Cloudflare IP Batch Test Tool" -makedepends=('go') -conflicts=("cloudflarespeedtest") +makedepends=('go' 'git') arch=('x86_64') url="https://github.com/XIU2/CloudflareSpeedTest" -source=("https://github.com/XIU2/CloudflareSpeedTest/archive/v${pkgver}.tar.gz" - 'patch.patch') -sha256sums=('SKIP' - 'SKIP') - -prepare() { - cd "CloudflareSpeedTest-$pkgver" - patch -p1 -i "$srcdir/patch.patch" -} +source=("git+${url}.git#tag=v${pkgver}") +sha256sums=('SKIP') build() { - cd "CloudflareSpeedTest-$pkgver" - - go build -o $pkgname + cd "CloudflareSpeedTest" + sed -i s@ip.txt@/usr/share/cloudflarespeedtest/ip.txt@g main.go + go build -ldflags="-X main.version=v$pkgver -linkmode=external" -o $pkgname } package() { - cd "CloudflareSpeedTest-$pkgver" + cd "CloudflareSpeedTest" install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname install -Dm644 ip.txt "$pkgdir"/usr/share/cloudflarespeedtest/ip.txt install -Dm644 ipv6.txt "$pkgdir"/usr/share/cloudflarespeedtest/ipv6.txt diff --git a/patch.patch b/patch.patch deleted file mode 100644 index b78994025244..000000000000 --- a/patch.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --git a/main.go b/main.go -index 7f8cfce..ce5a292 100644 ---- a/main.go -+++ b/main.go -@@ -3,24 +3,16 @@ package main - import (
- "flag"
- "fmt"
-- "io/ioutil"
-- "net/http"
-- "os"
-- "runtime"
- "time"
-
- "CloudflareSpeedTest/task"
- "CloudflareSpeedTest/utils"
- )
-
--var (
-- version, versionNew string
--)
-
- func init() {
-- var printVersion bool
- var help = `
--CloudflareSpeedTest ` + version + `
-+CloudflareSpeedTest
- 测试 Cloudflare CDN 所有 IP 的延迟和速度,获取最快 IP (IPv4+IPv6)!
- https://github.com/XIU2/CloudflareSpeedTest
-
-@@ -46,7 +38,7 @@ https://github.com/XIU2/CloudflareSpeedTest - -p 10
- 显示结果数量;测速后直接显示指定数量的结果,为 0 时不显示结果直接退出;(默认 10 个)
- -f ip.txt
-- IP段数据文件;如路径含有空格请加上引号;支持其他 CDN IP段;(默认 ip.txt)
-+ 手动指定IP段数据文件;支持其他 CDN IP段;(默认为程序预置ip段)
- -o result.csv
- 写入结果文件;如路径含有空格请加上引号;值为空时不写入文件 [-o ""];(默认 result.csv)
- -dd
-@@ -55,8 +47,6 @@ https://github.com/XIU2/CloudflareSpeedTest - IPv6测速模式;确保 IP 段数据文件内只包含 IPv6 IP段,软件不支持同时测速 IPv4+IPv6;(默认 IPv4)
- -allip
- 测速全部的IP;对 IP 段中的每个 IP (仅支持 IPv4) 进行测速;(默认 每个 IP 段随机测速一个 IP)
-- -v
-- 打印程序版本+检查版本更新
- -h
- 打印帮助说明
- `
-@@ -72,11 +62,10 @@ https://github.com/XIU2/CloudflareSpeedTest - flag.BoolVar(&task.Disable, "dd", false, "禁用下载测速")
- flag.BoolVar(&task.IPv6, "ipv6", false, "启用IPv6")
- flag.BoolVar(&task.TestAll, "allip", false, "测速全部 IP")
-- flag.StringVar(&task.IPFile, "f", "ip.txt", "IP 数据文件")
-+ flag.StringVar(&task.IPFile, "f", "/usr/share/cloudflarespeedtest/ip.txt", "IP 数据文件")
- flag.Float64Var(&task.MinSpeed, "sl", 0, "下载速度下限")
- flag.IntVar(&utils.PrintNum, "p", 10, "显示结果数量")
- flag.StringVar(&utils.Output, "o", "result.csv", "输出结果文件")
-- flag.BoolVar(&printVersion, "v", false, "打印程序版本")
- flag.Usage = func() { fmt.Print(help) }
- flag.Parse()
-
-@@ -87,24 +76,12 @@ https://github.com/XIU2/CloudflareSpeedTest - utils.InputMinDelay = time.Duration(minDelay) * time.Millisecond
- task.Timeout = time.Duration(downloadTime) * time.Second
-
-- if printVersion {
-- println(version)
-- fmt.Println("检查版本更新中...")
-- checkUpdate()
-- if versionNew != "" {
-- fmt.Printf("*** 发现新版本 [%s]!请前往 [https://github.com/XIU2/CloudflareSpeedTest] 更新! ***", versionNew)
-- } else {
-- fmt.Println("当前为最新版本 [" + version + "]!")
-- }
-- os.Exit(0)
-- }
- }
-
- func main() {
-- go checkUpdate() // 检查版本更新
- task.InitRandSeed() // 置随机数种子
-
-- fmt.Printf("# XIU2/CloudflareSpeedTest %s \n\n", version)
-+ fmt.Printf("# XIU2/CloudflareSpeedTest \n\n")
-
- // 开始延迟测速
- pingData := task.NewPing().Run().FilterDelay()
-@@ -113,9 +90,6 @@ func main() { - utils.ExportCsv(speedData)
- speedData.Print(task.IPv6)
-
-- if versionNew != "" {
-- fmt.Printf("\n*** 发现新版本 [%s]!请前往 [https://github.com/XIU2/CloudflareSpeedTest] 更新! ***\n", versionNew)
-- }
- endPrint()
- }
-
-@@ -123,29 +97,6 @@ func endPrint() { - if utils.NoPrintResult() {
- return
- }
-- if runtime.GOOS == "windows" { // 如果是 Windows 系统,则需要按下 回车键 或 Ctrl+C 退出(避免通过双击运行时,测速完毕后直接关闭)
-- fmt.Printf("按下 回车键 或 Ctrl+C 退出。")
-- var pause int
-- fmt.Scanln(&pause)
-- }
- }
-
--// 检查更新
--func checkUpdate() {
-- timeout := 10 * time.Second
-- client := http.Client{Timeout: timeout}
-- res, err := client.Get("https://api.xiu2.xyz/ver/cloudflarespeedtest.txt")
-- if err != nil {
-- return
-- }
-- // 读取资源数据 body: []byte
-- body, err := ioutil.ReadAll(res.Body)
-- if err != nil {
-- return
-- }
-- // 关闭资源流
-- defer res.Body.Close()
-- if string(body) != version {
-- versionNew = string(body)
-- }
--}
-+
|