updated debian scripts

v2/debian-plasma.sh

@@ -2,20 +2,11 @@
 set -euo pipefail
 
 ##########################
-# Color helpers (no tput)
+# Color helpers
 ##########################
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[0;33m'
-CYAN='\033[0;36m'
-GRAY='\033[0;37m'
-BOLD='\033[1m'
-RESET='\033[0m'
-
-# Disable colors if output is not a terminal
-if [ ! -t 1 ]; then
-    RED='' GREEN='' YELLOW='' CYAN='' GRAY='' BOLD='' RESET=''
-fi
+RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[0;33m'
+CYAN='\033[0;36m'; GRAY='\033[0;37m'; BOLD='\033[1m'; RESET='\033[0m'
+[ ! -t 1 ] && RED='' GREEN='' YELLOW='' CYAN='' GRAY='' BOLD='' RESET=''
 
 color_red()    { printf '%b' "$RED"; }
 color_green()  { printf '%b' "$GREEN"; }
@@ -25,115 +16,57 @@ color_gray()   { printf '%b' "$GRAY"; }
 color_reset()  { printf '%b' "$RESET"; }
 
 ##########################
-# Use exported variables from main detection script
+# Logging
 ##########################
-OS="${DETECTED_OS}"
-DDE="${DETECTED_DE}"
+LOGFILE="${LOGFILE:-/tmp/debian-plasma.log}"
+exec > >(tee -a "$LOGFILE") 2>&1
+
+##########################
+# Variables
+##########################
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+OS="${DETECTED_OS:-debian}"
+DDE="${DETECTED_DE:-}"
 DE="${SELECTED_DE:-none}"
 TWM="${SELECTED_TWM:-none}"
 INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
 
 ##########################
-# 4. Desktop Environment installation
+# Helper functions
 ##########################
-color_yellow
-echo "Installing KDE Plasma..."
-color_reset
+install_packages() { sudo apt update; sudo apt install -y --no-install-recommends "$@"; }
+is_package_installed() { dpkg -s "$1" &>/dev/null; }
+detect_de() { command -v startplasma-x11 >/dev/null 2>&1 && echo "plasma" || echo ""; }
+detect_display_manager() { [ -f /etc/X11/default-display-manager ] && basename "$(cat /etc/X11/default-display-manager)" || echo ""; }
+enable_graphical_target() { sudo systemctl enable sddm; sudo systemctl set-default graphical.target; }
 
-# Detect if KDE Plasma and SDDM are installed and install if needed
-if [[ -z "$DDE" ]]; then
-    color_cyan
-    echo
-    echo "No Desktop Environment detected. Installing KDE Plasma (light setup with SDDM)..."
-    color_reset
+##########################
+# Install Plasma
+##########################
+color_yellow; echo "Starting KDE Plasma installation..."; color_reset
 
-    sudo apt update
-    sudo apt install -y --no-install-recommends sddm \
-        plasma-desktop dolphin konsole kate \
-        plasma-nm plasma-workspace kde-config-gtk-style \
-        kde-config-sddm plasma-discover plasma-discover-common \
-        plasma-discover-backend-snap plasma-discover-backend-flatpak \
-        plasma-discover-backend-fwupd kscreen
+CURRENT_DE="$(detect_de)"
+CURRENT_DM="$(detect_display_manager)"
 
-    # Enable SDDM as the display manager
-    sudo systemctl enable sddm
-    sudo systemctl set-default graphical.target
-
-    # Rebuild Discover cache
-    kbuildsycoca6
-
-    color_green
-    echo
-    echo "KDE Plasma with SDDM installed successfully."
-    echo "You can reboot now to start KDE Plasma."
-    color_reset
+if [[ -z "$CURRENT_DE" ]]; then
+    color_cyan; echo "No DE detected. Installing KDE Plasma with SDDM..."; color_reset
+    install_packages sddm plasma-desktop dolphin konsole kate plasma-nm plasma-workspace kde-config-gtk-style kde-config-sddm plasma-discover kscreen
+    enable_graphical_target
+    color_green; echo "KDE Plasma with SDDM installed successfully."; color_reset
 else
-    color_cyan
-    echo
-    echo "You already have $DE installed."
-    color_reset
-
-    # Check if LightDM is installed and active
-    if systemctl is-active --quiet lightdm; then
-        color_yellow
-        echo
-        echo "LightDM is currently active. Replacing with SDDM..."
-        color_reset
-
-        # Disable and remove LightDM
+    color_cyan; echo "Detected existing DE: $CURRENT_DE"; color_reset
+    if [[ "$CURRENT_DM" == "lightdm" ]]; then
+        color_yellow; echo "Replacing LightDM with SDDM..."; color_reset
         sudo systemctl disable lightdm
         sudo apt purge -y lightdm lightdm-gtk-greeter
-
-        # Install and enable SDDM
-        sudo apt install -y sddm
-        sudo systemctl enable sddm
-        sudo systemctl set-default graphical.target
-
-        color_green
-        echo
-        echo "LightDM removed and replaced with SDDM."
-        color_reset
+        install_packages sddm
+        enable_graphical_target
+        color_green; echo "LightDM replaced with SDDM."; color_reset
     else
-        color_cyan
-        echo
-        echo "No LightDM detected, leaving current display manager unchanged."
-        color_reset
+        color_cyan; echo "Current DM: ${CURRENT_DM:-none}, leaving unchanged."; color_reset
     fi
 fi
 
-##########################
-# Cleanup unwanted packages
-##########################
-# Define packages to remove (example)
-packages=("vim" "vim-runtime" "vim-common" "vim-tiny" "mousepad" "parole")
-
-is_package_installed() {
-    dpkg -s "$1" &> /dev/null
-}
-
-for package in "${packages[@]}"; do
-    if is_package_installed "$package"; then
-        echo "Removing $package..."
-        sudo apt-get purge -y "$package"
-    else
-        echo "$package is not installed, skipping."
-    fi
-
-    # Optional double-check
-    if ! is_package_installed "$package"; then
-        echo "$package successfully removed."
-    else
-        echo "$package is still installed. Check manually."
-    fi
-
-    echo "----------------------------"
-done
-
-##########################
-# Network cleanup
-##########################
-sudo mv /etc/network/interfaces /etc/network/interfaces.bak
-sudo systemctl restart NetworkManager
-
-# Remove leftover dependencies
-sudo apt-get autoremove -y
+# Pause
+read -n 1 -s -r -p "Press any key to continue"
+echo