From fa2b06dd506308dc9b7e599d3cd1045a36189db7 Mon Sep 17 00:00:00 2001
From: Feng Yu <abcfy2@163.com>
Date: Mon, 27 Apr 2020 21:34:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9aria2=E7=9A=84=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E8=84=9A=E6=9C=AC=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=B0=BD?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=A4=9A=E7=9A=84trackers=E4=BB=A5=E4=BE=BF?=
 =?UTF-8?q?=E4=BA=8E=E5=8A=A0=E9=80=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/aria2/config/aria2.conf | 2 +-
 apps/aria2/config/aria2.uci  | 4 ++--
 apps/aria2/scripts/aria2.sh  | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/aria2/config/aria2.conf b/apps/aria2/config/aria2.conf
index 82c607a..f47c358 100644
--- a/apps/aria2/config/aria2.conf
+++ b/apps/aria2/config/aria2.conf
@@ -46,7 +46,7 @@ dir=/extdisks/sda1/下载
 #dht-file-path=/extdisks/sda1/下载/.aria2/dht.dat
 #dht-file-path6=/extdisks/sda1/下载/.aria2/dht6.dat
 #bt-tracker
-#bt-tracker=
+bt-tracker=
 #文件缓存, 使用内置的文件缓存, 如果你不相信Linux内核文件缓存和磁盘内置缓存时使用, 需要1.16及以上版本
 #disk-cache=0
 #另一种Linux文件缓存方式, 使用前确保您使用的内核支持此选项, 需要1.15及以上版本(?)
diff --git a/apps/aria2/config/aria2.uci b/apps/aria2/config/aria2.uci
index 18f8d27..361cf8e 100644
--- a/apps/aria2/config/aria2.uci
+++ b/apps/aria2/config/aria2.uci
@@ -4,5 +4,5 @@ needver="0.1.7"
 backupfiles="config/aria2.conf"
 supports="linux_arm,linux_mips,linux_x86_64"
 appinfo="Linux下一款高效的下载工具"
-newinfo="更新arm版aria2版本，webui版本"
-version="0.0.9"
+newinfo="使用尽可能多的trackers以便于加速"
+version="0.1.0"
diff --git a/apps/aria2/scripts/aria2.sh b/apps/aria2/scripts/aria2.sh
index 13e2ead..53bd247 100644
--- a/apps/aria2/scripts/aria2.sh
+++ b/apps/aria2/scripts/aria2.sh
@@ -40,7 +40,9 @@ set_config() {
     fi
 
     # 自动更新bt-tracker
-    list=`wgetlist https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt|awk NF|sed ":a;N;s/\n/,/g;ta"`
+    list1="$(wgetlist https://cdn.jsdelivr.net/gh/ngosang/trackerslist/trackers_all.txt)"
+    list2="$(wgetlist https://trackerslist.com/all.txt)"
+    list="$(echo -e "${list1}\n${list2}" | sort -u | awk NF | sed ":a;N;s/\n/,/g;ta")"
     if [ ! -z "${list}" ]; then
         sed -i "s#.*bt-tracker.*#bt-tracker=${list}#" ${mbroot}/apps/${appname}/config/${appname}.conf
         logsh "【$service】" "更新bt-tracker"