From 6f14ee9dc77163afd3a3b194910e7f1865471a77 Mon Sep 17 00:00:00 2001
From: j-hc <j-hc@users.noreply.github.com>
Date: Sat, 14 Dec 2024 19:42:32 +0300
Subject: [PATCH] update build-termux

---
 build-termux.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/build-termux.sh b/build-termux.sh
index 85e63af..42cfeb5 100755
--- a/build-termux.sh
+++ b/build-termux.sh
@@ -26,24 +26,17 @@ until
 do sleep 1; done
 if [ ! -f ~/.rvmm_"$(date '+%Y%m')" ]; then
 	pr "Setting up environment..."
-	yes "" | pkg update -y && pkg install -y openssl git wget jq openjdk-17 zip
+	yes "" | pkg update -y && pkg install -y openssl git curl jq openjdk-17 zip
 	: >~/.rvmm_"$(date '+%Y%m')"
 fi
 mkdir -p /sdcard/Download/revanced-magisk-module/
 
-if [ ! -d revanced-magisk-module ]; then
-	pr "Cloning revanced-magisk-module."
-	git clone https://github.com/j-hc/revanced-magisk-module --depth 1
-	cd revanced-magisk-module
-	sed -i '/^enabled.*/d; /^\[.*\]/a enabled = false' config.toml
-	grep -q 'revanced-magisk-module' ~/.gitconfig 2>/dev/null \
-		|| git config --global --add safe.directory ~/revanced-magisk-module
-else
-	cd revanced-magisk-module
+if [ -d revanced-magisk-module ] || [ -f config.toml ]; then
+	if [ -d revanced-magisk-module ]; then cd revanced-magisk-module; fi
 	pr "Checking for revanced-magisk-module updates"
 	git fetch
 	if git status | grep -q 'is behind\|fatal'; then
-		pr "revanced-magisk-module already is not synced with upstream."
+		pr "revanced-magisk-module is not synced with upstream."
 		pr "Cloning revanced-magisk-module. config.toml will be preserved."
 		cd ..
 		cp -f revanced-magisk-module/config.toml .
@@ -52,10 +45,17 @@ else
 		mv -f config.toml revanced-magisk-module/config.toml
 		cd revanced-magisk-module
 	fi
+else
+	pr "Cloning revanced-magisk-module."
+	git clone https://github.com/j-hc/revanced-magisk-module --depth 1
+	cd revanced-magisk-module
+	sed -i '/^enabled.*/d; /^\[.*\]/a enabled = false' config.toml
+	grep -q 'revanced-magisk-module' ~/.gitconfig 2>/dev/null ||
+		git config --global --add safe.directory ~/revanced-magisk-module
 fi
 
-[ -f ~/storage/downloads/revanced-magisk-module/config.toml ] \
-	|| cp config.toml ~/storage/downloads/revanced-magisk-module/config.toml
+[ -f ~/storage/downloads/revanced-magisk-module/config.toml ] ||
+	cp config.toml ~/storage/downloads/revanced-magisk-module/config.toml
 
 if ask "Open rvmm-config-gen to generate a config?"; then
 	am start -a android.intent.action.VIEW -d https://j-hc.github.io/rvmm-config-gen/