updated debian files

v2/debian-gnome.sh

@@ -2,17 +2,26 @@
 set -euo pipefail
 
 ##########################
-# Color helpers
+# Color helpers (no tput)
 ##########################
-tput_reset() { tput sgr0; }
-tput_black() { tput setaf 0; }
-tput_red() { tput setaf 1; }
-tput_green() { tput setaf 2; }
-tput_yellow() { tput setaf 3; }
-tput_blue() { tput setaf 4; }
-tput_purple() { tput setaf 5; }
-tput_cyan() { tput setaf 6; }
-tput_gray() { tput setaf 7; }
+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'
+
+if [ ! -t 1 ]; then
+    RED='' GREEN='' YELLOW='' CYAN='' GRAY='' BOLD='' RESET=''
+fi
+
+color_red()    { printf '%b' "$RED"; }
+color_green()  { printf '%b' "$GREEN"; }
+color_yellow() { printf '%b' "$YELLOW"; }
+color_cyan()   { printf '%b' "$CYAN"; }
+color_gray()   { printf '%b' "$GRAY"; }
+color_reset()  { printf '%b' "$RESET"; }
 
 ##########################
 # Use exported variables from main detection script
@@ -24,31 +33,30 @@ TWM="${SELECTED_TWM:-none}"
 INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
 
 ##########################
-# 4. Desktop Environment installation
+# Desktop Environment installation
 ##########################
-tput_yellow
+color_yellow
 echo "Installing Gnome..."
-tput_reset
+color_reset
 
-#detect if Gnome and SDDM are installed and if not install them
 if [[ -z "$DDE" ]]; then
-    tput_cyan
+    color_cyan
     echo
     echo "No Desktop Environment detected. Installing Gnome (light setup with SDDM)..."
-    tput_reset
+    color_reset
 
     sudo apt update
     sudo apt install -y --no-install-recommends sddm \
-    gnome-shell \
-    gnome-terminal \
-    nautilus \
-    gnome-control-center \
-    gnome-system-monitor \
-    gnome-settings-daemon \
-    gnome-tweaks \
-    network-manager-gnome \
-    gnome-keyring \
-    gnome-session
+        gnome-shell \
+        gnome-terminal \
+        nautilus \
+        gnome-control-center \
+        gnome-system-monitor \
+        gnome-settings-daemon \
+        gnome-tweaks \
+        network-manager-gnome \
+        gnome-keyring \
+        gnome-session
 
     # Enable SDDM as the display manager
     sudo systemctl enable sddm
@@ -56,23 +64,22 @@ if [[ -z "$DDE" ]]; then
     # Enable graphical target
     sudo systemctl set-default graphical.target
 
-    tput_green
+    color_green
     echo
     echo "Gnome with SDDM installed successfully."
     echo "You can reboot now to start Gnome."
-    tput_reset
+    color_reset
 else
-    tput_cyan
+    color_cyan
     echo
     echo "You already have $DE installed."
-    tput_reset
+    color_reset
 
-    # Check if LightDM is installed and active
     if systemctl is-active --quiet lightdm; then
-        tput_yellow
+        color_yellow
         echo
         echo "LightDM is currently active. Replacing with SDDM..."
-        tput_reset
+        color_reset
 
         # Disable and remove LightDM
         sudo systemctl disable lightdm
@@ -85,51 +92,44 @@ else
         # Enable graphical target
         sudo systemctl set-default graphical.target
 
-        tput_green
+        color_green
         echo
         echo "LightDM removed and replaced with SDDM."
-        tput_reset
+        color_reset
     else
-        tput_cyan
+        color_cyan
         echo
         echo "No LightDM detected, leaving current display manager unchanged."
-        tput_reset
+        color_reset
     fi
 fi
 
-#cleanup unwanted packages
-    # Packages to remove
-    #packages=("vim" "vim-runtime" "vim-common" "vim-tiny" "mousepad" "parole")  
-    #sudo apt-mark manual xfce4-goodies
-    
-    # Function to check if a package is installed
-    is_package_installed() {
-        dpkg -s "$1" &> /dev/null
-    }
+##########################
+# Cleanup unwanted packages
+##########################
+# packages=("vim" "vim-runtime" "vim-common" "vim-tiny" "mousepad" "parole")
+is_package_installed() { dpkg -s "$1" &> /dev/null; }
 
-    # Iterate over each package
-    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
+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
+    if ! is_package_installed "$package"; then
+        echo "$package successfully removed."
+    else
+        echo "$package is still installed. Check manually."
+    fi
 
-        echo "----------------------------"
-    done
+    echo "----------------------------"
+done
 
-    # Resolving network issues
-    sudo mv /etc/network/interfaces /etc/network/interfaces.bak
-    sudo systemctl restart NetworkManager
-
-    # Remove leftover dependencies
-    sudo apt-get autoremove -y
+# Resolving network issues
+sudo mv /etc/network/interfaces /etc/network/interfaces.bak || true
+sudo systemctl restart NetworkManager
 
+# Remove leftover dependencies
+sudo apt-get autoremove -y