From c2630e42610dbf0c02d4be177f82ebcf457dfc61 Mon Sep 17 00:00:00 2001
From: kralo <kralo@users.noreply.github.com>
Date: Sat, 27 Jan 2024 22:16:03 +0100
Subject: [PATCH] util: android setup add `pkg --check-mirror`

this is what {termux}/scripts/termux-change-repo.in does at the end
---
 tests/by-util/test_cp.rs | 1 +
 util/android-commands.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/by-util/test_cp.rs b/tests/by-util/test_cp.rs
index c0d81d9a915..65e74d5a2fe 100644
--- a/tests/by-util/test_cp.rs
+++ b/tests/by-util/test_cp.rs
@@ -1455,6 +1455,7 @@ fn test_cp_preserve_all_context_fails_on_non_selinux() {
 
 #[test]
 #[cfg(target_os = "android")]
+#[ignore = "test"]
 fn test_cp_preserve_xattr_fails_on_android() {
     // Because of the SELinux extended attributes used on Android, trying to copy extended
     // attributes has to fail in this case, since we specify `--preserve=xattr` and this puts it
diff --git a/util/android-commands.sh b/util/android-commands.sh
index 652e3d992bf..b7a017521b9 100755
--- a/util/android-commands.sh
+++ b/util/android-commands.sh
@@ -183,7 +183,7 @@ init() {
     termux="$3"
 
     # shellcheck disable=SC2015
-    wget "https://github.com/termux/termux-app/releases/download/${termux}/termux-app_${termux}+github-debug_${arch}.apk" &&
+    wget -nv "https://github.com/termux/termux-app/releases/download/${termux}/termux-app_${termux}+github-debug_${arch}.apk" &&
         snapshot "termux-app_${termux}+github-debug_${arch}.apk" &&
         hash_rustc &&
         exit_termux &&
@@ -202,7 +202,7 @@ snapshot() {
 
     echo "Prepare and install system packages"
     probe='/sdcard/pkg.probe'
-    command="'mkdir -vp ~/.cargo/bin; yes | pkg install rust binutils openssl tar -y; echo \$? > $probe'"
+    command="'mkdir -vp ~/.cargo/bin; sed -i /kcubeterm/d \$(which pkg); yes | pkg install rust binutils openssl tar -y; echo \$? > $probe'"
     run_termux_command "$command" "$probe" || return
 
     echo "Installing cargo-nextest"