updated debian colors

This commit is contained in:
[yuri]
2025-11-10 14:56:50 +01:00
parent ad9d761979
commit d9e4e603b4

View File

@@ -34,10 +34,8 @@ TWM="${SELECTED_TWM:-none}"
INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}" INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
color_cyan
echo echo
echo "Starting Debian setup..." echo "${CYAN}Starting Debian setup...${RESET}"
color_reset
echo echo
echo "DE: $DE, TWM: $TWM, Install Level: $INSTALL_LEVEL" echo "DE: $DE, TWM: $TWM, Install Level: $INSTALL_LEVEL"
@@ -47,10 +45,8 @@ echo "DE: $DE, TWM: $TWM, Install Level: $INSTALL_LEVEL"
# 0. Ensure curl is installed # 0. Ensure curl is installed
########################## ##########################
if ! command -v curl >/dev/null 2>&1; then if ! command -v curl >/dev/null 2>&1; then
color_yellow
echo echo
echo "curl is not installed. Installing..." echo "${YELLOW}curl is not installed. Installing...${RESET}"
color_reset
sudo apt update sudo apt update
sudo apt -y install curl sudo apt -y install curl
fi fi
@@ -58,16 +54,12 @@ fi
########################## ##########################
# 1. Add contrib and non-free if missing # 1. Add contrib and non-free if missing
########################## ##########################
color_yellow
echo echo
echo "Checking /etc/apt/sources.list for contrib/non-free..." echo "${YELLOW}Checking /etc/apt/sources.list for contrib/non-free...${RESET}"
color_reset
sudo cp /etc/apt/sources.list /etc/apt/sources.list.bak.$(date +%s) sudo cp /etc/apt/sources.list /etc/apt/sources.list.bak.$(date +%s)
sudo sed -i -r 's/^(deb\s+\S+\s+\S+)\s+(main)$/\1 main contrib non-free/' /etc/apt/sources.list sudo sed -i -r 's/^(deb\s+\S+\s+\S+)\s+(main)$/\1 main contrib non-free/' /etc/apt/sources.list
color_green
echo echo
echo "Updated sources.list to include contrib/non-free where needed." echo "${GREEN}Updated sources.list to include contrib/non-free where needed.${RESET}"
color_reset
########################## ##########################
# 1a. Update archive.debian.org if needed # 1a. Update archive.debian.org if needed
@@ -87,80 +79,60 @@ CURRENT_INDEX=$(codename_index "$CURRENT_CODENAME")
BULLSEYE_INDEX=$(codename_index "bullseye") BULLSEYE_INDEX=$(codename_index "bullseye")
if [[ "$CURRENT_INDEX" -ge "$BULLSEYE_INDEX" ]] && grep -q "archive.debian.org" /etc/apt/sources.list; then if [[ "$CURRENT_INDEX" -ge "$BULLSEYE_INDEX" ]] && grep -q "archive.debian.org" /etc/apt/sources.list; then
color_yellow
echo echo
echo "Found archive.debian.org in sources.list and system is Bullseye or newer, updating to deb.debian.org..." echo "${YELLOW}Found archive.debian.org in sources.list and system is Bullseye or newer, updating to deb.debian.org...${RESET}"
color_reset
sudo sed -i -r 's|archive\.debian\.org|deb.debian.org|g' /etc/apt/sources.list sudo sed -i -r 's|archive\.debian\.org|deb.debian.org|g' /etc/apt/sources.list
color_green
echo echo
echo "Updated sources.list to use deb.debian.org." echo "${GREEN}Updated sources.list to use deb.debian.org.${RESET}"
color_reset
fi fi
########################## ##########################
# 2. Full update and upgrade # 2. Full update and upgrade
########################## ##########################
color_yellow
echo echo
echo "Updating package lists..." echo "${YELLOW}Updating package lists...${RESET}"
color_reset
sudo apt update sudo apt update
# Autoremove before full-upgrade # Autoremove before full-upgrade
AUTOREMOVE_PENDING=$(apt -s autoremove | grep -E 'Remv' || true) AUTOREMOVE_PENDING=$(apt -s autoremove | grep -E 'Remv' || true)
if [[ -n "$AUTOREMOVE_PENDING" ]]; then if [[ -n "$AUTOREMOVE_PENDING" ]]; then
color_yellow
echo echo
echo "Removing packages that are no longer required before upgrade..." echo "${YELLOW}Removing packages that are no longer required before upgrade...${RESET}"
color_reset
sudo apt -y autoremove sudo apt -y autoremove
fi fi
color_yellow
echo echo
echo "Upgrading installed packages..." echo "${YELLOW}Upgrading installed packages...${RESET}"
color_reset
sudo apt -y full-upgrade sudo apt -y full-upgrade
# Autoremove after full-upgrade # Autoremove after full-upgrade
AUTOREMOVE_PENDING=$(apt -s autoremove | grep -E 'Remv' || true) AUTOREMOVE_PENDING=$(apt -s autoremove | grep -E 'Remv' || true)
if [[ -n "$AUTOREMOVE_PENDING" ]]; then if [[ -n "$AUTOREMOVE_PENDING" ]]; then
color_yellow
echo echo
echo "Removing packages that are no longer required after upgrade..." echo "${YELLOW}Removing packages that are no longer required after upgrade...${RESET}"
color_reset
sudo apt -y autoremove sudo apt -y autoremove
fi fi
UPGRADE_PENDING=$(apt list --upgradable 2>/dev/null | grep -v Listing || true) UPGRADE_PENDING=$(apt list --upgradable 2>/dev/null | grep -v Listing || true)
if [[ -n "$UPGRADE_PENDING" ]]; then if [[ -n "$UPGRADE_PENDING" ]]; then
color_red
echo echo
echo "Some packages were upgraded. A reboot is recommended before continuing." echo "${RED}Some packages were upgraded. A reboot is recommended before continuing.${RESET}"
color_reset
read -rp "Reboot now? [y/N]: " reboot_choice read -rp "Reboot now? [y/N]: " reboot_choice
case "${reboot_choice,,}" in case "${reboot_choice,,}" in
y|yes) y|yes)
color_red
echo echo
echo "Rebooting now. After reboot, please restart this script to continue..." echo "${RED}Rebooting now. After reboot, please restart this script to continue...${RESET}"
color_reset
sudo reboot sudo reboot
;; ;;
*) *)
color_yellow
echo echo
echo "Skipping reboot. Make sure to reboot manually before continuing upgrades." echo "${YELLOW}Skipping reboot. Make sure to reboot manually before continuing upgrades.${RESET}"
color_reset
exit 0 exit 0
;; ;;
esac esac
else else
color_green
echo echo
echo "All packages are up to date. Continuing to Debian major version check..." echo "${GREEN}All packages are up to date. Continuing to Debian major version check...${RESET}"
color_reset
fi fi
########################## ##########################
@@ -170,11 +142,9 @@ DEBIAN_SEQUENCE=(buster bullseye bookworm trixie)
CURRENT_CODENAME=$(grep -Po 'deb\s+\S+\s+\K\S+' /etc/apt/sources.list | grep -E '^(buster|bullseye|bookworm|trixie)$' | head -n1) CURRENT_CODENAME=$(grep -Po 'deb\s+\S+\s+\K\S+' /etc/apt/sources.list | grep -E '^(buster|bullseye|bookworm|trixie)$' | head -n1)
LATEST_CODENAME=${DEBIAN_SEQUENCE[-1]} LATEST_CODENAME=${DEBIAN_SEQUENCE[-1]}
color_cyan
echo echo
echo "Current codename: $CURRENT_CODENAME" echo "${CYAN}Current codename: $CURRENT_CODENAME"
echo "Latest stable codename: $LATEST_CODENAME" echo "Latest stable codename: $LATEST_CODENAME${RESET}"
color_reset
while [[ "$CURRENT_CODENAME" != "$LATEST_CODENAME" ]]; do while [[ "$CURRENT_CODENAME" != "$LATEST_CODENAME" ]]; do
NEXT_CODENAME="" NEXT_CODENAME=""
@@ -186,38 +156,28 @@ while [[ "$CURRENT_CODENAME" != "$LATEST_CODENAME" ]]; do
done done
if [[ -z "$NEXT_CODENAME" ]]; then if [[ -z "$NEXT_CODENAME" ]]; then
color_red
echo echo
echo "Error: Cannot determine next codename after $CURRENT_CODENAME" echo "${RED}Error: Cannot determine next codename after $CURRENT_CODENAME${RESET}"
color_reset
exit 1 exit 1
fi fi
color_yellow
echo echo
echo "Detected codename $CURRENT_CODENAME, next stable version: $NEXT_CODENAME" echo "${YELLOW}Detected codename $CURRENT_CODENAME, next stable version: $NEXT_CODENAME${RESET}"
color_reset
read -rp "Do you want to upgrade to $NEXT_CODENAME? [y/N]: " choice read -rp "Do you want to upgrade to $NEXT_CODENAME? [y/N]: " choice
case "${choice,,}" in case "${choice,,}" in
y|yes) y|yes)
color_yellow
echo echo
echo "Updating sources.list to $NEXT_CODENAME..." echo "${YELLOW}Updating sources.list to $NEXT_CODENAME...${RESET}"
color_reset
sudo sed -i -r "s/\b$CURRENT_CODENAME\b/$NEXT_CODENAME/g" /etc/apt/sources.list sudo sed -i -r "s/\b$CURRENT_CODENAME\b/$NEXT_CODENAME/g" /etc/apt/sources.list
color_yellow
echo echo
echo "Updating packages..." echo "${YELLOW}Updating packages...${RESET}"
color_reset
sudo apt update sudo apt update
AUTOREMOVE_PENDING=$(apt -s autoremove | grep -E 'Remv' || true) AUTOREMOVE_PENDING=$(apt -s autoremove | grep -E 'Remv' || true)
if [[ -n "$AUTOREMOVE_PENDING" ]]; then if [[ -n "$AUTOREMOVE_PENDING" ]]; then
color_yellow
echo echo
echo "Removing packages that are no longer required before upgrade..." echo "${YELLOW}Removing packages that are no longer required before upgrade...${RESET}"
color_reset
sudo apt -y autoremove sudo apt -y autoremove
fi fi
@@ -225,25 +185,19 @@ while [[ "$CURRENT_CODENAME" != "$LATEST_CODENAME" ]]; do
AUTOREMOVE_PENDING=$(apt -s autoremove | grep -E 'Remv' || true) AUTOREMOVE_PENDING=$(apt -s autoremove | grep -E 'Remv' || true)
if [[ -n "$AUTOREMOVE_PENDING" ]]; then if [[ -n "$AUTOREMOVE_PENDING" ]]; then
color_yellow
echo echo
echo "Removing packages that are no longer required after upgrade..." echo "${YELLOW}Removing packages that are no longer required after upgrade...${RESET}"
color_reset
sudo apt -y autoremove sudo apt -y autoremove
fi fi
color_green
echo echo
echo "Upgrade to $NEXT_CODENAME complete. A reboot is recommended." echo "${GREEN}Upgrade to $NEXT_CODENAME complete. A reboot is recommended.${RESET}"
color_reset
read -rp "Press Enter to reboot..." _ read -rp "Press Enter to reboot..." _
sudo reboot sudo reboot
;; ;;
*) *)
color_yellow
echo echo
echo "Skipping upgrade to $NEXT_CODENAME. Continuing with current version." echo "${YELLOW}Skipping upgrade to $NEXT_CODENAME. Continuing with current version.${RESET}"
color_reset
break break
;; ;;
esac esac
@@ -251,41 +205,31 @@ while [[ "$CURRENT_CODENAME" != "$LATEST_CODENAME" ]]; do
CURRENT_CODENAME=$(grep -Po 'deb\s+\S+\s+\K\S+' /etc/apt/sources.list | grep -E '^(buster|bullseye|bookworm|trixie)$' | head -n1) CURRENT_CODENAME=$(grep -Po 'deb\s+\S+\s+\K\S+' /etc/apt/sources.list | grep -E '^(buster|bullseye|bookworm|trixie)$' | head -n1)
done done
color_green
echo echo
echo "Debian is now at codename $CURRENT_CODENAME. Continuing with DE/TWM installation..." echo "${GREEN}Debian is now at codename $CURRENT_CODENAME. Continuing with DE/TWM installation...${RESET}"
color_reset
########################## ##########################
# 4. Desktop Environment installation # 4. Desktop Environment installation
########################## ##########################
case "$DE" in case "$DE" in
xfce|plasma|gnome) xfce|plasma|gnome)
color_yellow
echo echo
echo "Preparing to install $DE..." echo "${YELLOW}Preparing to install $DE...${RESET}"
color_reset
SCRIPT_NAME="$SCRIPT_DIR/${OS}-${DE}.sh" SCRIPT_NAME="$SCRIPT_DIR/${OS}-${DE}.sh"
if [[ -f "$SCRIPT_NAME" ]]; then if [[ -f "$SCRIPT_NAME" ]]; then
color_cyan
echo echo
echo "Running $SCRIPT_NAME..." echo "${CYAN}Running $SCRIPT_NAME...${RESET}"
color_reset
bash "$SCRIPT_NAME" bash "$SCRIPT_NAME"
else else
color_red
echo echo
echo "Error: $SCRIPT_NAME not found!" echo "${RED}Error: $SCRIPT_NAME not found!${RESET}"
color_reset
exit 1 exit 1
fi fi
;; ;;
none) none)
color_gray
echo echo
echo "No Desktop Environment selected, skipping DE installation." echo "${GRAY}No Desktop Environment selected, skipping DE installation.${RESET}"
color_reset
;; ;;
esac esac
@@ -294,31 +238,23 @@ esac
########################## ##########################
case "$TWM" in case "$TWM" in
chadwm|hyprland) chadwm|hyprland)
color_yellow
echo echo
echo "Installing $TWM..." echo "${YELLOW}Installing $TWM...${RESET}"
color_reset
SCRIPT_NAME="$SCRIPT_DIR/${OS}-${TWM}.sh" SCRIPT_NAME="$SCRIPT_DIR/${OS}-${TWM}.sh"
if [[ -f "$SCRIPT_NAME" ]]; then if [[ -f "$SCRIPT_NAME" ]]; then
color_cyan
echo echo
echo "Running $SCRIPT_NAME..." echo "${CYAN}Running $SCRIPT_NAME...${RESET}"
color_reset
bash "$SCRIPT_NAME" bash "$SCRIPT_NAME"
else else
color_red
echo echo
echo "Error: $SCRIPT_NAME not found!" echo "${RED}Error: $SCRIPT_NAME not found!${RESET}"
color_reset
exit 1 exit 1
fi fi
;; ;;
none) none)
color_gray
echo echo
echo "No tiling window manager selected." echo "${GRAY}No tiling window manager selected.${RESET}"
color_reset
;; ;;
esac esac
@@ -327,54 +263,40 @@ esac
########################## ##########################
case "$INSTALL_LEVEL" in case "$INSTALL_LEVEL" in
minimal|full|workstation|server) minimal|full|workstation|server)
color_cyan
echo echo
echo "Installation level: $INSTALL_LEVEL" echo "${CYAN}Installation level: $INSTALL_LEVEL${RESET}"
color_reset
SCRIPT_NAME="$SCRIPT_DIR/${OS}-${INSTALL_LEVEL}.sh" SCRIPT_NAME="$SCRIPT_DIR/${OS}-${INSTALL_LEVEL}.sh"
if [[ -f "$SCRIPT_NAME" ]]; then if [[ -f "$SCRIPT_NAME" ]]; then
color_cyan
echo echo
echo "Running $SCRIPT_NAME..." echo "${CYAN}Running $SCRIPT_NAME...${RESET}"
color_reset
bash "$SCRIPT_NAME" bash "$SCRIPT_NAME"
else else
color_red
echo echo
echo "Error: $SCRIPT_NAME not found!" echo "${RED}Error: $SCRIPT_NAME not found!${RESET}"
color_reset
exit 1 exit 1
fi fi
;; ;;
esac esac
color_green
echo echo
echo "Debian setup complete." echo "${GREEN}Debian setup complete.${RESET}"
color_reset
########################## ##########################
# 7. Installation Finished # 7. Installation Finished
########################## ##########################
color_red
echo echo
echo "The installation has finished. A reboot is recommended before continuing." echo "${RED}The installation has finished. A reboot is recommended before continuing.${RESET}"
color_reset
read -rp "Reboot now? [y/N]: " reboot_choice read -rp "Reboot now? [y/N]: " reboot_choice
case "${reboot_choice,,}" in case "${reboot_choice,,}" in
y|yes) y|yes)
color_red
echo echo
echo "Rebooting now." echo "${RED}Rebooting now.${RESET}"
color_reset
sudo reboot sudo reboot
;; ;;
*) *)
color_yellow
echo echo
echo "Skipping reboot. Make sure to reboot manually before continuing upgrades." echo "${YELLOW}Skipping reboot. Make sure to reboot manually before continuing upgrades.${RESET}"
color_reset
exit 0 exit 0
;; ;;
esac esac