From 30ae2a9bb76da320d9dfd2a694834d4ce2628d9a Mon Sep 17 00:00:00 2001
From: JaKooLit <ejhay.games@gmail.com>
Date: Fri, 7 Mar 2025 10:12:27 +0900
Subject: [PATCH] adjusted to disable sddm option if non-SDDM login managers
 are active

---
 install-scripts/nvidia.sh |  3 ---
 install.sh                | 12 +++++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/install-scripts/nvidia.sh b/install-scripts/nvidia.sh
index b29c88b..534b0eb 100755
--- a/install-scripts/nvidia.sh
+++ b/install-scripts/nvidia.sh
@@ -14,9 +14,6 @@ nvidia_pkg=(
   nvidia-vaapi-driver
 )
 
-# for ubuntu-nvidia owners! just delete #
-# sudo ubuntu-drivers install
-
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
diff --git a/install.sh b/install.sh
index c21c41e..e213b9c 100755
--- a/install.sh
+++ b/install.sh
@@ -168,7 +168,7 @@ if check_services_running; then
 
     # Display the active login manager(s) in the whiptail message box
     whiptail --title "Active non-SDDM login manager(s) detected" \
-        --msgbox "The following non-SDDM login manager(s) are active:\n\n$active_list\n\nWARN: DO NOT install or choose to install SDDM & SDDM theme in the choices\nOr disable those active services first before running this script\n\nIf you ignored this warning and you chose to install SDDM, script will return to choices in the middle of the installation.\n\n🏳️ So choose wisely\n\n😎 Ja " 22 80
+        --msgbox "The following login manager(s) are active:\n\n$active_list\n\nIf you want to install SDDM and SDDM theme, stop and disable first the active services above first before running this script\n\nYour option to install SDDM and SDDM theme has now been removed\n\n😎 Ja " 22 80
 fi
 
 # Check if NVIDIA GPU is detected
@@ -204,14 +204,20 @@ if [ "$input_group_detected" == "true" ]; then
     )
 fi
 
+# Conditionally add SDDM and SDDM theme options if no active login manager is found
+if ! check_services_running; then
+    options_command+=(
+        "sddm" "Install & configure SDDM login manager?" "OFF"
+        "sddm_theme" "Download & Install Additional SDDM theme?" "OFF"
+    )
+fi
+
 # Add the remaining static options
 options_command+=(
     "gtk_themes" "Install GTK themes (required for Dark/Light function)" "OFF"
     "bluetooth" "Do you want script to configure Bluetooth?" "OFF"
     "thunar" "Do you want Thunar file manager to be installed?" "OFF"
     "ags" "Install AGS v1 for Desktop-Like Overview" "OFF"
-    "sddm" "Install & configure SDDM login manager?" "OFF"
-    "sddm_theme" "Download & Install Additional SDDM theme?" "OFF"
     "xdph" "Install XDG-DESKTOP-PORTAL-HYPRLAND (for screen share)?" "OFF"
     "zsh" "Install zsh shell with Oh-My-Zsh?" "OFF"
     "pokemon" "Add Pokemon color scripts to your terminal?" "OFF"