From 81efa38c70f9bf8b72ec25c2e94ab2644fe13f69 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" Date: Sat, 2 Mar 2024 09:22:16 +0900 Subject: [PATCH] replaced sddm-git with sddm --- CHANGELOGS.md | 3 +++ install-scripts/sddm.sh | 17 ++--------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/CHANGELOGS.md b/CHANGELOGS.md index aef2f58..f479fcc 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,8 @@ ## Changelogs +## 1 Mar 2024 +- replaced sddm-git with sddm + ## 11 Jan 2024 - dropped wlsunset diff --git a/install-scripts/sddm.sh b/install-scripts/sddm.sh index 57cd408..13b7637 100755 --- a/install-scripts/sddm.sh +++ b/install-scripts/sddm.sh @@ -9,7 +9,7 @@ sddm=( qt5-graphicaleffects qt5-quickcontrols2 qt5-svg - sddm-git + sddm ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## @@ -26,22 +26,9 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh" # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_sddm.log" -# SDDM - -# Check if SDDM is already installed -if pacman -Qs sddm > /dev/null; then - # Prompt user to manually install sddm-git to remove SDDM - if [[ -z $manual_install_sddm ]]; then - read -n1 -rep "SDDM is already installed. Would you like to manually install sddm-git to remove it? This requires manual intervention. (y/n)" manual_install_sddm - fi - echo - if [[ $manual_install_sddm =~ ^[Yy]$ ]]; then - $ISAUR -S sddm-git 2>&1 | tee -a "$LOG" - fi -fi # Install SDDM and SDDM theme -printf "${NOTE} Installing SDDM-git and dependencies........\n" +printf "${NOTE} Installing sddm and dependencies........\n" for package in "${sddm[@]}"; do install_package "$package" 2>&1 | tee -a "$LOG" [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $package install has failed, please check the install.log"; exit 1; }