From 90d26ee7212cf2e48528d00b9c0dddc3e6accce6 Mon Sep 17 00:00:00 2001 From: MacRimi <123239993+MacRimi@users.noreply.github.com> Date: Sun, 2 Feb 2025 09:50:27 +0100 Subject: [PATCH] Update config_menu.sh --- scripts/menus/config_menu.sh | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/scripts/menus/config_menu.sh b/scripts/menus/config_menu.sh index 85c7575..08e8a25 100644 --- a/scripts/menus/config_menu.sh +++ b/scripts/menus/config_menu.sh @@ -13,29 +13,15 @@ # Configuration ============================================ REPO_URL="https://raw.githubusercontent.com/MacRimi/ProxMenux/main" -UTILS_URL="https://raw.githubusercontent.com/MacRimi/ProxMenux/main/scripts/utils.sh" BASE_DIR="/usr/local/share/proxmenux" -CACHE_FILE="$BASE_DIR/cache.json" +UTILS_FILE="$BASE_DIR/utils.sh" VENV_PATH="/opt/googletrans-env" -LANGUAGE=$(jq -r '.language // "en"' "$BASE_DIR/config.json" 2>/dev/null) -if ! source <(curl -sSf "$UTILS_URL"); then - echo "$(translate 'Error: Could not load utils.sh from') $UTILS_URL" - exit 1 +if [[ -f "$UTILS_FILE" ]]; then + source "$UTILS_FILE" fi - -initialize_cache() { - if [ ! -f "$CACHE_FILE" ]; then - echo "{}" > "$CACHE_FILE" - return - fi -} - -load_language() { - if [ -f "$CONFIG_FILE" ]; then - LANGUAGE=$(jq -r '.language' "$CONFIG_FILE") - fi -} +load_language +initialize_cache # ========================================================== @@ -65,7 +51,6 @@ show_config_menu() { -# Change language change_language() { LANGUAGE=$(whiptail --title "$(translate "Change Language")" --menu "$(translate "Select a new language for the menu:")" 20 60 12 \ "en" "$(translate "English (Recommended)")" \