From 5894e8a9b29a830e2e2f44e24a4f0a685b2fb466 Mon Sep 17 00:00:00 2001
From: termux-pacman-bot <termux-pacman-bot@outlook.com>
Date: Mon, 27 Jun 2022 13:59:03 +0000
Subject: [PATCH] packages/termux-tools

---
 packages/termux-tools/build.sh                |  2 +-
 .../mirrors/europe/cdn.lumito.net             |  6 ++++
 .../termux-tools/mirrors/europe/mirror.mwt.me |  6 ++++
 packages/termux-tools/pkg                     |  6 ++--
 packages/termux-tools/termux-change-repo      | 28 +++++++++----------
 5 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 packages/termux-tools/mirrors/europe/cdn.lumito.net
 create mode 100644 packages/termux-tools/mirrors/europe/mirror.mwt.me

diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index 23ae21101e..29f811f887 100644
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://termux.org/
 TERMUX_PKG_DESCRIPTION="Basic system tools for Termux"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.13
+TERMUX_PKG_VERSION=1.16
 TERMUX_PKG_SKIP_SRC_EXTRACT=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_ESSENTIAL=true
diff --git a/packages/termux-tools/mirrors/europe/cdn.lumito.net b/packages/termux-tools/mirrors/europe/cdn.lumito.net
new file mode 100644
index 0000000000..e0f7cf42ba
--- /dev/null
+++ b/packages/termux-tools/mirrors/europe/cdn.lumito.net
@@ -0,0 +1,6 @@
+# This file is sourced by pkg
+# Mirror by Lumito, hosted in the UK
+WEIGHT=1
+MAIN="https://cdn.lumito.net/termux/termux-main"
+ROOT="https://cdn.lumito.net/termux/termux-root"
+X11="https://cdn.lumito.net/termux/termux-x11"
diff --git a/packages/termux-tools/mirrors/europe/mirror.mwt.me b/packages/termux-tools/mirrors/europe/mirror.mwt.me
new file mode 100644
index 0000000000..77465f2e7b
--- /dev/null
+++ b/packages/termux-tools/mirrors/europe/mirror.mwt.me
@@ -0,0 +1,6 @@
+# This file is sourced by pkg
+# Mirror by Mwt, hosted in Luxembourg
+WEIGHT=1
+MAIN="https://mirror.mwt.me/termux/main"
+ROOT="https://mirror.mwt.me/termux/root"
+X11="https://mirror.mwt.me/termux/x11"
diff --git a/packages/termux-tools/pkg b/packages/termux-tools/pkg
index 840789047b..d7658452b3 100755
--- a/packages/termux-tools/pkg
+++ b/packages/termux-tools/pkg
@@ -103,15 +103,15 @@ select_mirror() {
 	local default_repo="@TERMUX_PREFIX@/etc/termux/mirrors/default"
 
 	if [ -d "@TERMUX_PREFIX@/etc/termux/chosen_mirrors" ]; then
-		mirrors=($(find @TERMUX_PREFIX@/etc/termux/chosen_mirrors/ -type f ! -name "*\.dpkg-old"))
+		mirrors=($(find @TERMUX_PREFIX@/etc/termux/chosen_mirrors/ -type f ! -name "*\.dpkg-old" ! -name "*~"))
 	elif [ -L "@TERMUX_PREFIX@/etc/termux/chosen_mirrors" ]; then
 		# Broken symlink, use all mirrors
 		mirrors=("@TERMUX_PREFIX@/etc/termux/mirrors/default")
-		mirrors+=($(find @TERMUX_PREFIX@/etc/termux/mirrors/{asia,china,europe,north_america}/ -type f ! -name "*\.dpkg-old"))
+		mirrors+=($(find @TERMUX_PREFIX@/etc/termux/mirrors/{asia,china,europe,north_america}/ -type f ! -name "*\.dpkg-old" ! -name "*~"))
 	else
 		echo "No group of mirrors selected. You might want to select a group by running 'termux-change-repo'"
 		mirrors=("@TERMUX_PREFIX@/etc/termux/mirrors/default")
-		mirrors+=($(find @TERMUX_PREFIX@/etc/termux/mirrors/{asia,china,europe,north_america}/ -type f ! -name "*\.dpkg-old"))
+		mirrors+=($(find @TERMUX_PREFIX@/etc/termux/mirrors/{asia,china,europe,north_america}/ -type f ! -name "*\.dpkg-old" ! -name "*~"))
 	fi
 
 	local current_mirror
diff --git a/packages/termux-tools/termux-change-repo b/packages/termux-tools/termux-change-repo
index beadac0138..470477fd80 100755
--- a/packages/termux-tools/termux-change-repo
+++ b/packages/termux-tools/termux-change-repo
@@ -10,36 +10,34 @@ if [ "$1" == "--help" ] || [ "$1" == "-help" ]; then
     exit 0
 fi
 
+unlink_and_link() {
+    MIRROR_GROUP="$1"
+    if [ -L "@TERMUX_PREFIX@/etc/termux/chosen_mirrors" ]; then
+        unlink "@TERMUX_PREFIX@/etc/termux/chosen_mirrors"
+    fi
+    ln -s "${MIRROR_GROUP}" "@TERMUX_PREFIX@/etc/termux/chosen_mirrors"
+}
+
 select_repository_group() {
     if [ "$1" == "Mirrors in Asia" ]; then
         echo "[*] Mirrors in Asia (excl. China) selected"
-        unlink @TERMUX_PREFIX@/etc/termux/chosen_mirrors
-        ln -sf @TERMUX_PREFIX@/etc/termux/mirrors/asia \
-           @TERMUX_PREFIX@/etc/termux/chosen_mirrors
+        unlink_and_link @TERMUX_PREFIX@/etc/termux/mirrors/asia
 
     elif [ "$1" == "Mirrors in China" ]; then
         echo "[*] Mirrors in China selected"
-        unlink @TERMUX_PREFIX@/etc/termux/chosen_mirrors
-        ln -sf @TERMUX_PREFIX@/etc/termux/mirrors/china \
-           @TERMUX_PREFIX@/etc/termux/chosen_mirrors
+        unlink_and_link @TERMUX_PREFIX@/etc/termux/mirrors/china
 
     elif [ "$1" == "Mirrors in Europe" ]; then
         echo "[*] Mirrors in Europe selected"
-        unlink @TERMUX_PREFIX@/etc/termux/chosen_mirrors
-        ln -sf @TERMUX_PREFIX@/etc/termux/mirrors/europe \
-            @TERMUX_PREFIX@/etc/termux/chosen_mirrors
+        unlink_and_link @TERMUX_PREFIX@/etc/termux/mirrors/europe
 
     elif [ "$1" == "Mirrors in North America" ]; then
         echo "[*] Mirrors in North America selected"
-        unlink @TERMUX_PREFIX@/etc/termux/chosen_mirrors
-        ln -sf @TERMUX_PREFIX@/etc/termux/mirrors/north_america \
-            @TERMUX_PREFIX@/etc/termux/chosen_mirrors
+        unlink_and_link @TERMUX_PREFIX@/etc/termux/mirrors/north_america
 
     elif [ "$1" == "All mirrors" ]; then
         echo "[*] All mirrors selected"
-        unlink @TERMUX_PREFIX@/etc/termux/chosen_mirrors
-        ln -sf @TERMUX_PREFIX@/etc/termux/mirrors/all \
-            @TERMUX_PREFIX@/etc/termux/chosen_mirrors
+        unlink_and_link @TERMUX_PREFIX@/etc/termux/mirrors/all
 
     else
         echo "[!] Error: unknown mirror group: '$1'. Exiting"