updated debian scripts

v2/debian-full.sh

@@ -1,68 +1,32 @@
 #!/bin/bash
 set -euo pipefail
 
-##########################
-# Color helpers (no tput)
-##########################
-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'
+# Colors + logging same as others
+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=''
 
-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"; }
+color_green() { printf '%b' "$GREEN"; }
+color_reset() { printf '%b' "$RESET"; }
+
+LOGFILE="${LOGFILE:-/tmp/debian-full.log}"
+exec > >(tee -a "$LOGFILE") 2>&1
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+OS="${DETECTED_OS:-debian}"
 
 ##########################
-# Use exported variables from main detection script
+# Helper functions
 ##########################
-OS="${DETECTED_OS}"
-DDE="${DETECTED_DE}"
-DE="${SELECTED_DE:-none}"
-TWM="${SELECTED_TWM:-none}"
-INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
+install_packages() { sudo apt update; sudo apt install -y --no-install-recommends "$@"; }
+is_package_installed() { dpkg -s "$1" &>/dev/null; }
 
-# Pause before continuing
-read -n 1 -s -r -p "Press any key to continue"
+color_yellow; echo "Starting full setup..."; color_reset
 
-color_cyan
-echo
-echo "Running Debian Minimal setup first..."
-color_reset
+# Run minimal first
+bash "$SCRIPT_DIR/debian-minimal.sh"
 
-# Run the minimal setup
-bash debian-minimal.sh
-
-color_yellow
-echo
-echo "Continuing with Debian FULL installation..."
-color_reset
-
-# Install additional FULL packages
-sudo apt install -y \
-    arandr \
-    catfish \
-    galculator \
-    network-manager \
-    network-manager-applet \
-    network-manager-openvpn \
-    numlockx \
-    pavucontrol \
-    playerctl \
-    xcolors \
-    gparted
-
-color_green
-echo
-echo "Debian FULL installation packages installed."
-color_reset
+# Add extra packages
+install_packages arandr catfish galculator network-manager network-manager-applet network-manager-openvpn numlockx pavucontrol playerctl gparted
+color_green; echo "Full setup completed."; color_reset