From c6d34ec0ad9e4f2620069378dbdcb55bae57bb3f Mon Sep 17 00:00:00 2001
From: thedragonsinn <98635854+thedragonsinn@users.noreply.github.com>
Date: Fri, 7 Feb 2025 21:11:23 +0530
Subject: [PATCH] chore: add termux pypi repo before installimg requirements
 and simplify logic in scripts

---
 scripts/install_external_modules.sh |  9 +++------
 scripts/install_termux_reqs.sh      | 11 ++++++-----
 scripts/install_ub_core.sh          |  4 +---
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/scripts/install_external_modules.sh b/scripts/install_external_modules.sh
index 5f0ba54..6c6a02a 100755
--- a/scripts/install_external_modules.sh
+++ b/scripts/install_external_modules.sh
@@ -1,15 +1,12 @@
 #!/usr/bin/env bash
 
-if [ -z "${EXTRA_MODULES_REPO}" ]; then
-    echo "EXTRA_MODULES_REPO not set, Skipping..."
-    exit
-fi
+[ -z "$EXTRA_MODULES_REPO" ] && { echo "EXTRA_MODULES_REPO not set, Skipping..."; exit; }
 
-repo_name=$(basename "${EXTRA_MODULES_REPO}")
+repo_name=$(basename "$EXTRA_MODULES_REPO")
 
 echo "Installing ${repo_name} to app/modules"
 
-git clone -q "${EXTRA_MODULES_REPO}" "app/modules"
+git clone -q "$EXTRA_MODULES_REPO" "app/modules" || { echo "Failed to clone external repo"; exit; }
 
 pip -q install --no-cache-dir -r app/modules/req*.txt
 
diff --git a/scripts/install_termux_reqs.sh b/scripts/install_termux_reqs.sh
index 808e294..4c70585 100755
--- a/scripts/install_termux_reqs.sh
+++ b/scripts/install_termux_reqs.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 
-if ! echo "${PATH}" | grep -qi "com.termux"; then
-  echo "Not a termux Env, Skipping..."
-  exit
-fi
+grep -qi "com.termux" <<< "$PATH" || { echo "Not a termux Env, Skipping..."; exit; }
+
+mkdir -p "${HOME}/.config/pip" /dev/null 2>&1
+
+echo -e '[global]\nextra-index-url = https://termux-user-repository.github.io/pypi/' > "${HOME}/.config/pip.conf"
 
 ./scripts/install_ub_core.sh
 
-grep -Ev "^#|google-generativeai|pillow" req.txt | xargs -n 1 pip install
+grep -Ev "^#|openai" req.txt | xargs -n 1 pip install
diff --git a/scripts/install_ub_core.sh b/scripts/install_ub_core.sh
index 87f2802..fa5e801 100755
--- a/scripts/install_ub_core.sh
+++ b/scripts/install_ub_core.sh
@@ -2,8 +2,6 @@
 
 dual_mode_arg=""
 
-if [ ! -z "${USE_DUAL_BRANCH}" ]; then
-    dual_mode_arg="@dual_mode"
-fi
+[ -n "$USE_DUAL_BRANCH" ] && dual_mode_arg="@dual_mode"
 
 pip -q install --no-cache-dir --force-reinstall "git+https://github.com/thedragonsinn/ub-core${dual_mode_arg}"
\ No newline at end of file