termux · Grimler91 · Apr 5, 2024 · Apr 3, 2024 · Apr 3, 2024 · Apr 3, 2024
diff --git a/configure.ac b/configure.ac
@@ -22,7 +22,7 @@ dnl  along with termux-tools.  If not, see
 dnl  <https://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.69])
-AC_INIT([termux-tools], [1.41.2], [support@termux.dev])
+AC_INIT([termux-tools], [1.41.3], [support@termux.dev])
 
 AM_INIT_AUTOMAKE([foreign])
 

diff --git a/mirrors/Makefile.am b/mirrors/Makefile.am
@@ -1,14 +1,14 @@
 # Default mirrors
 pkgdata_MIRRORS = default
 
-# Mirrors in Asia (excl. China and Russia)
+# Mirrors in Asia (excl. Chinese_Mainland and Russia)
 pkgdata_ASIA_MIRRORS = mirror.albony.xyz mirror.bardia.tech          \
 mirrors.cbrx.io linux.domainesia.com mirror.nevacloud.com            \
 mirror.textcord.xyz tmx.xvx.my.id  mirrors.nguyenhoang.cloud         \
-mirror.freedif.org
+mirror.freedif.org mirror.twds.com.tw
 
-# Mirrors in China
-pkgdata_CHINA_MIRRORS = mirrors.tuna.tsinghua.edu.cn                 \
+# Mirrors in Chinese Mainland
+pkgdata_CHINESE_MAINLAND_MIRRORS = mirrors.tuna.tsinghua.edu.cn                 \
 mirror.iscas.ac.cn mirrors.nju.edu.cn mirrors.pku.edu.cn             \
 mirrors.ustc.edu.cn mirrors.bfsu.edu.cn	mirrors.aliyun.com           \
 mirrors.cqupt.edu.cn mirror.nyist.edu.cn mirrors.sau.edu.cn	         \
@@ -52,6 +52,21 @@ china/mirrors.dgut.edu.cn \
 china/mirrors.hit.edu.cn \
 china/mirrors.njupt.edu.cn \
 china/mirrors.scau.edu.cn \
+china/mirror.iscas.ac.cn \
+china/mirror.nyist.edu.cn \
+china/mirror.sjtu.edu.cn \
+china/mirrors.aliyun.com \
+china/mirrors.bfsu.edu.cn \
+china/mirrors.cqupt.edu.cn \
+china/mirrors.nju.edu.cn \
+china/mirrors.pku.edu.cn \
+china/mirrors.qvq.net.cn \
+china/mirrors.sau.edu.cn \
+china/mirrors.sdu.edu.cn \
+china/mirrors.sustech.edu.cn \
+china/mirrors.tuna.tsinghua.edu.cn \
+china/mirrors.ustc.edu.cn \
+china/mirrors.zju.edu.cn \
 europe/cdn.lumito.net \
 europe/mirror.termux.dv \
 europe/termux.sahilister.in \
@@ -79,15 +94,15 @@ uninstall-$1:
 endef
 
 $(eval $(call install-mirror-rule,asia,ASIA))
-$(eval $(call install-mirror-rule,china,CHINA))
+$(eval $(call install-mirror-rule,chinese_mainland,CHINESE_MAINLAND))
 $(eval $(call install-mirror-rule,europe,EUROPE))
 $(eval $(call install-mirror-rule,north_america,NORTH_AMERICA))
 $(eval $(call install-mirror-rule,oceania,OCEANIA))
 $(eval $(call install-mirror-rule,south_america,SOUTH_AMERICA))
 $(eval $(call install-mirror-rule,russia,RUSSIA))
 
 $(eval $(call uninstall-mirror-rule,asia,ASIA))
-$(eval $(call uninstall-mirror-rule,china,CHINA))
+$(eval $(call uninstall-mirror-rule,chinese_mainland,CHINESE_MAINLAND))
 $(eval $(call uninstall-mirror-rule,europe,EUROPE))
 $(eval $(call uninstall-mirror-rule,north_america,NORTH_AMERICA))
 $(eval $(call uninstall-mirror-rule,oceania,OCEANIA))
@@ -124,11 +139,11 @@ create-deb-control-files:
 
 
 
-install-data-local: uninstall-removed-mirrors install-default install-asia install-china install-europe install-north_america install-oceania install-south_america install-russia create-deb-control-files
+install-data-local: uninstall-removed-mirrors install-default install-asia install-chinese_mainland install-europe install-north_america install-oceania install-south_america install-russia create-deb-control-files
 
-uninstall-local: uninstall-removed-mirrors uninstall-default uninstall-asia uninstall-china uninstall-europe uninstall-north_america uninstall-oceania uninstall-south_america uninstall-russia
+uninstall-local: uninstall-removed-mirrors uninstall-default uninstall-asia uninstall-chinese_mainland uninstall-europe uninstall-north_america uninstall-oceania uninstall-south_america uninstall-russia
 
 EXTRA_DIST = $(pkgdata_MIRRORS) $(pkgdata_ASIA_MIRRORS)		\
-$(pkgdata_CHINA_MIRRORS) $(pkgdata_EUROPE_MIRRORS)		\
+$(pkgdata_CHINESE_MAINLAND_MIRRORS) $(pkgdata_EUROPE_MIRRORS)		\
 $(pkgdata_NORTH_AMERICA_MIRRORS) $(pkgdata_OCEANIA_MIRRORS)	\
 $(pkgdata_SOUTH_AMERICA_MIRRORS)
diff --git a/mirrors/asia/mirror.twds.com.tw b/mirrors/asia/mirror.twds.com.tw
@@ -0,0 +1,6 @@
+# This file is sourced by pkg
+# Mirror by Taiwan Digital Streaming Co, hosted in Taiwan
+WEIGHT=1
+MAIN="https://mirror.twds.com.tw/termux/termux-main"
+ROOT="https://mirror.twds.com.tw/termux/termux-root"
+X11="https://mirror.twds.com.tw/termux/termux-x11"
diff --git a/mirrors/china/mirror.iscas.ac.cn → mirrors/chinese_mainland/mirror.iscas.ac.cn b/mirrors/china/mirror.iscas.ac.cn → mirrors/chinese_mainland/mirror.iscas.ac.cn
diff --git a/mirrors/china/mirror.nyist.edu.cn → mirrors/chinese_mainland/mirror.nyist.edu.cn b/mirrors/china/mirror.nyist.edu.cn → mirrors/chinese_mainland/mirror.nyist.edu.cn
diff --git a/mirrors/china/mirror.sjtu.edu.cn → mirrors/chinese_mainland/mirror.sjtu.edu.cn b/mirrors/china/mirror.sjtu.edu.cn → mirrors/chinese_mainland/mirror.sjtu.edu.cn
diff --git a/mirrors/china/mirrors.aliyun.com → mirrors/chinese_mainland/mirrors.aliyun.com b/mirrors/china/mirrors.aliyun.com → mirrors/chinese_mainland/mirrors.aliyun.com
diff --git a/mirrors/china/mirrors.bfsu.edu.cn → mirrors/chinese_mainland/mirrors.bfsu.edu.cn b/mirrors/china/mirrors.bfsu.edu.cn → mirrors/chinese_mainland/mirrors.bfsu.edu.cn
diff --git a/mirrors/china/mirrors.cqupt.edu.cn → ...ors/chinese_mainland/mirrors.cqupt.edu.cn b/mirrors/china/mirrors.cqupt.edu.cn → ...ors/chinese_mainland/mirrors.cqupt.edu.cn
diff --git a/mirrors/china/mirrors.nju.edu.cn → mirrors/chinese_mainland/mirrors.nju.edu.cn b/mirrors/china/mirrors.nju.edu.cn → mirrors/chinese_mainland/mirrors.nju.edu.cn
diff --git a/mirrors/china/mirrors.pku.edu.cn → mirrors/chinese_mainland/mirrors.pku.edu.cn b/mirrors/china/mirrors.pku.edu.cn → mirrors/chinese_mainland/mirrors.pku.edu.cn
diff --git a/mirrors/china/mirrors.qvq.net.cn → mirrors/chinese_mainland/mirrors.qvq.net.cn b/mirrors/china/mirrors.qvq.net.cn → mirrors/chinese_mainland/mirrors.qvq.net.cn
diff --git a/mirrors/china/mirrors.sau.edu.cn → mirrors/chinese_mainland/mirrors.sau.edu.cn b/mirrors/china/mirrors.sau.edu.cn → mirrors/chinese_mainland/mirrors.sau.edu.cn
diff --git a/mirrors/china/mirrors.sdu.edu.cn → mirrors/chinese_mainland/mirrors.sdu.edu.cn b/mirrors/china/mirrors.sdu.edu.cn → mirrors/chinese_mainland/mirrors.sdu.edu.cn
diff --git a/mirrors/china/mirrors.sustech.edu.cn → ...s/chinese_mainland/mirrors.sustech.edu.cn b/mirrors/china/mirrors.sustech.edu.cn → ...s/chinese_mainland/mirrors.sustech.edu.cn
diff --git a/mirrors/china/mirrors.tuna.tsinghua.edu.cn → ...ese_mainland/mirrors.tuna.tsinghua.edu.cn b/mirrors/china/mirrors.tuna.tsinghua.edu.cn → ...ese_mainland/mirrors.tuna.tsinghua.edu.cn
diff --git a/mirrors/china/mirrors.ustc.edu.cn → mirrors/chinese_mainland/mirrors.ustc.edu.cn b/mirrors/china/mirrors.ustc.edu.cn → mirrors/chinese_mainland/mirrors.ustc.edu.cn
diff --git a/mirrors/china/mirrors.zju.edu.cn → mirrors/chinese_mainland/mirrors.zju.edu.cn b/mirrors/china/mirrors.zju.edu.cn → mirrors/chinese_mainland/mirrors.zju.edu.cn
diff --git a/scripts/pkg.in b/scripts/pkg.in
@@ -178,11 +178,11 @@ select_mirror() {
 	elif [ -L "@TERMUX_PREFIX@/etc/termux/chosen_mirrors" ]; then
 		# Broken symlink, use all mirrors
 		mirrors=("${MIRROR_BASE_DIR}/default")
-		mirrors+=($(find ${MIRROR_BASE_DIR}/{asia,china,europe,north_america,oceania,south_america,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~"))
+		mirrors+=($(find ${MIRROR_BASE_DIR}/{asia,chinese_mainland,europe,north_america,oceania,south_america,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~"))
 	else
 		echo "No mirror or mirror group selected. You might want to select one by running 'termux-change-repo'"
 		mirrors=("${MIRROR_BASE_DIR}/default")
-		mirrors+=($(find ${MIRROR_BASE_DIR}/{asia,china,europe,north_america,oceania,south_america,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~"))
+		mirrors+=($(find ${MIRROR_BASE_DIR}/{asia,chinese_mainland,europe,north_america,oceania,south_america,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~"))
 	fi
 
 	# Mirrors are rotated if 6 hours timeout has been passed or mirror is no longer accessible.

diff --git a/scripts/termux-change-repo.in b/scripts/termux-change-repo.in
@@ -23,8 +23,8 @@ unlink_and_link() {
 select_repository_group() {
     MIRRORS=()
     MIRRORS+=("All mirrors" "All in the entire world" "on")
-    MIRRORS+=("Mirrors in Asia" "All in Asia (excl. China and Russia)" "off")
-    MIRRORS+=("Mirrors in China" "All in China" "off")
+    MIRRORS+=("Mirrors in Asia" "All in Asia (excl. Chinese Mainland and Russia)" "off")
+    MIRRORS+=("Mirrors in Chinese Mainland" "All in Chinese Mainland" "off")
     MIRRORS+=("Mirrors in Europe" "All in Europe" "off")
     MIRRORS+=("Mirrors in North America" "All in North America" "off")
     MIRRORS+=("Mirrors in Oceania" "All in Oceania" "off")
@@ -55,12 +55,12 @@ select_repository_group() {
     rm "$TEMPFILE"
 
     if [ "$mirror_group" == "Mirrors in Asia" ]; then
-        echo "[*] Mirrors in Asia (excl. China and Russia) selected"
+        echo "[*] Mirrors in Asia (excl. Chinese Mainland and Russia) selected"
         unlink_and_link ${MIRROR_BASE_DIR}/asia
 
-    elif [ "$mirror_group" == "Mirrors in China" ]; then
-        echo "[*] Mirrors in China selected"
-        unlink_and_link ${MIRROR_BASE_DIR}/china
+    elif [ "$mirror_group" == "Mirrors in Chinese Mainland" ]; then
+        echo "[*] Mirrors in Chinese Mainland selected"
+        unlink_and_link ${MIRROR_BASE_DIR}/chinese_mainland
 
     elif [ "$mirror_group" == "Mirrors in Europe" ]; then
         echo "[*] Mirrors in Europe selected"
@@ -101,7 +101,7 @@ get_mirror_description() {
 }
 
 select_individual_mirror() {
-    mirrors=($(find ${MIRROR_BASE_DIR}/{asia,china,europe,north_america,oceania,south_america,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~"))
+    mirrors=($(find ${MIRROR_BASE_DIR}/{asia,chinese_mainland,europe,north_america,oceania,south_america,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~"))
 
     # Choose default mirror per default
     MIRRORS=("$(get_mirror_url "${MIRROR_BASE_DIR}/default")" "$(get_mirror_description "${MIRROR_BASE_DIR}/default")" "on")