From 213e3757df8e2a7bdc0a9006c3e81d2c15968c47 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 7 Mar 2025 10:12:24 +0900 Subject: [PATCH] adjusted to disable sddm option if non-SDDM login managers are active --- README.md | 10 ---------- install.sh | 14 ++++++++++---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index a137be2..3724c0e 100644 --- a/README.md +++ b/README.md @@ -110,16 +110,6 @@ chmod +x install.sh -### 🤟 semi-unattended installation (new for End of 2025) -- edit preset.sh to modify what packages you want. Make sure to change only with ON or OFF -- to use preset instead of usual `./install.sh` you can ran like this - -```bash -./install.sh --preset preset.sh -``` -- its called semi-unattended it is because you still have to answer some questions when installing KooL's Hyprland Dots - - #### ✨ for ZSH and OH-MY-ZSH installation > installer should auto change your default shell to zsh. However, if it does not, do this ```bash diff --git a/install.sh b/install.sh index f6be3b5..740bcea 100755 --- a/install.sh +++ b/install.sh @@ -205,14 +205,14 @@ 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 nvidia_detected=false if lspci | grep -i "nvidia" &> /dev/null; then nvidia_detected=true - whiptail --title "NVIDIA GPU Detected" --msgbox "NVIDIA GPU detected in your system.\n\nNOTE: The script will install nvidia-dkms, nvidia-utils, and nvidia-settings if you choose to configure." 12 60 + whiptail --title "NVIDIA GPU Detected" --msgbox "NVIDIA GPU detected in your system.\n\nNOTE: The script will install nvidia-dkms, nvidia-utils, and nvidia-settings if you chose to configure." 12 60 fi # Initialize the options array for whiptail checklist @@ -242,14 +242,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"