fix colors

This commit is contained in:
[yuri]
2025-11-10 15:54:48 +01:00
parent 58b72a37e9
commit ea55b1524b
9 changed files with 214 additions and 124 deletions

View File

@@ -1,14 +1,28 @@
#!/bin/bash
set -euo pipefail
# Colors + logging same pattern
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 helpers (printf-safe, 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"
color_yellow() { printf '%b' "$YELLOW"; }
color_green() { printf '%b' "$GREEN"; }
color_reset() { printf '%b' "$RESET"; }
# Disable colors if output is not a terminal
if [ ! -t 1 ]; then
RED="" GREEN="" YELLOW="" CYAN="" GRAY="" BOLD="" RESET=""
fi
say_red() { printf "%b%s%b\n" "$RED" "$*" "$RESET"; }
say_green() { printf "%b%s%b\n" "$GREEN" "$*" "$RESET"; }
say_yellow() { printf "%b%s%b\n" "$YELLOW" "$*" "$RESET"; }
say_cyan() { printf "%b%s%b\n" "$CYAN" "$*" "$RESET"; }
say_gray() { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
say_bold() { printf "%b%s%b\n" "$BOLD" "$*" "$RESET"; }
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
OS="${DETECTED_OS:-debian}"
@@ -19,7 +33,7 @@ OS="${DETECTED_OS:-debian}"
install_packages() { sudo apt update; sudo apt install -y --no-install-recommends "$@"; }
is_package_installed() { dpkg -s "$1" &>/dev/null; }
color_yellow; echo "Starting workstation setup..."; color_reset
say_yellow "Starting workstation setup..."
# Run full setup first
bash "$SCRIPT_DIR/debian-full.sh"
@@ -28,7 +42,7 @@ bash "$SCRIPT_DIR/debian-full.sh"
install_packages git vlc libreoffice
# End of script
color_green; echo "Workstation setup completed."; color_reset
say_green "Workstation setup completed."
# Pause
read -n 1 -s -r -p "Press any key to continue"