From f61f356d8779f861f21726a9a0c9a5712213874d Mon Sep 17 00:00:00 2001
From: MacRimi <ricoextincion@gmail.com>
Date: Wed, 7 May 2025 20:20:01 +0200
Subject: [PATCH] Update uninstall-tools.sh

---
 scripts/uninstall-tools.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/scripts/uninstall-tools.sh b/scripts/uninstall-tools.sh
index 5170891..3730084 100644
--- a/scripts/uninstall-tools.sh
+++ b/scripts/uninstall-tools.sh
@@ -74,19 +74,22 @@ uninstall_figurine() {
 
 show_uninstall_menu() {
     local options=()
-    
+    local index=1
+    declare -A uninstall_map
+
     if command -v fastfetch >/dev/null 2>&1; then
         options+=("$index" "$(translate "Uninstall") Fastfetch")
-        local fastfetch_option="$index"
+        uninstall_map[$index]="uninstall_fastfetch"
         index=$((index + 1))
     fi
 
     if command -v figurine >/dev/null 2>&1; then
         options+=("$index" "$(translate "Uninstall") Figurine")
-        local figurine_option="$index"
+        uninstall_map[$index]="uninstall_figurine"
         index=$((index + 1))
     fi
 
+
     if [ ${#options[@]} -eq 0 ]; then
         whiptail --title "ProxMenux" --msgbox "$(translate "No uninstallable tools detected.")" 10 60
         return_to_menu
@@ -97,10 +100,12 @@ show_uninstall_menu() {
                       --menu "$(translate "Select a tool to uninstall:")" 15 60 6 \
                       "${options[@]}" 3>&1 1>&2 2>&3)
 
-    case "$choice" in
-        "$fastfetch_option") uninstall_fastfetch ;;
-        "$figurine_option") uninstall_figurine ;;
-    esac
+    [ -z "$choice" ] && return_to_menu
+
+    local func="${uninstall_map[$choice]}"
+    if [[ -n "$func" ]]; then
+        "$func"
+    fi
 
     return_to_menu
 }