diff --git a/0-setup-linux.sh b/0-setup-linux.sh index b187714..e265fe5 100755 --- a/0-setup-linux.sh +++ b/0-setup-linux.sh @@ -37,6 +37,7 @@ color_yellow() { printf "%b%s%b\n" "$YELLOW" "$*" "$RESET"; } color_cyan() { printf "%b%s%b\n" "$CYAN" "$*" "$RESET"; } color_red() { printf "%b%s%b\n" "$RED" "$*" "$RESET"; } color_green() { printf "%b%s%b\n" "$GREEN" "$*" "$RESET"; } +color_gray() { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; } #------------------------------------------ # Debug Pause Helper @@ -60,8 +61,8 @@ pause_if_debug() { #------------------------------------------ echo color_yellow "----------------------------------------------------------------" -echo " script version 3.0" -echo "----------------------------------------------------------------" +color_yellow " script version 3.0" +color_yellow "----------------------------------------------------------------" echo #------------------------------------------ @@ -69,8 +70,8 @@ echo #------------------------------------------ echo color_yellow "----------------------------------------------------------------" -echo " Start OS Detection" -echo "----------------------------------------------------------------" +color_yellow " Start OS Detection" +color_yellow "----------------------------------------------------------------" echo source /etc/os-release @@ -102,13 +103,13 @@ esac if [[ -n "$OS" ]]; then color_cyan "----------------------------------------------------------------" - printf "Detected OS: %s (%s)\n" "$OS" "$OS_PRETTY" - printf "Version: %s\n" "$OS_VERSION" + color_cyan "Detected OS: %s (%s)\n" "$OS" "$OS_PRETTY" + color_cyan "Version: %s\n" "$OS_VERSION" color_cyan "----------------------------------------------------------------" else color_red "----------------------------------------------------------------" - printf "ERROR: Unsupported or unknown Linux distribution.\n" - printf "Detected: ID=%s, ID_LIKE=%s\n" "$OS_ID" "${OS_LIKE:-empty}" + color_red "ERROR: Unsupported or unknown Linux distribution.\n" + color_red "Detected: ID=%s, ID_LIKE=%s\n" "$OS_ID" "${OS_LIKE:-empty}" color_red "----------------------------------------------------------------" exit 1 fi @@ -120,8 +121,8 @@ pause_if_debug #------------------------------------------ echo color_yellow "----------------------------------------------------------------" -echo " Desktop Environment Selection" -echo "----------------------------------------------------------------" +color_yellow " Desktop Environment Selection" +color_yellow "----------------------------------------------------------------" echo DE_RAW="${XDG_CURRENT_DESKTOP:-${DESKTOP_SESSION:-}}" @@ -137,7 +138,7 @@ esac if [[ -n "$DE" ]]; then echo color_cyan "----------------------------------------------------------------" - printf "Detected Desktop Environment: %s (%s)\n" "$DE" "${DE_RAW:-unknown}" + color_cyan "Detected Desktop Environment: %s (%s)\n" "$DE" "${DE_RAW:-unknown}" color_cyan "----------------------------------------------------------------" else echo @@ -161,7 +162,7 @@ else done echo color_cyan "----------------------------------------------------------------" - printf "Selected Desktop Environment: %s\n" "$DE" + color_cyan "Selected Desktop Environment: %s\n" "$DE" color_cyan "----------------------------------------------------------------" fi @@ -172,7 +173,7 @@ pause_if_debug #------------------------------------------ echo color_yellow "----------------------------------------------------------------" -printf " Tiling WM Selection\n" +color_yellow " Tiling WM Selection\n" color_yellow "----------------------------------------------------------------" echo @@ -198,7 +199,7 @@ done echo color_cyan "----------------------------------------------------------------" -printf "Selected Tiling WM: %s\n" "$TWM" +color_cyan "Selected Tiling WM: %s\n" "$TWM" color_cyan "----------------------------------------------------------------" pause_if_debug @@ -208,7 +209,7 @@ pause_if_debug #------------------------------------------ echo color_yellow "----------------------------------------------------------------" -printf " Installation Level Selection\n" +color_yellow " Installation Level Selection\n" color_yellow "----------------------------------------------------------------" echo