v3-revamp

This commit is contained in:
2026-07-06 12:55:07 +02:00
parent 4768265ceb
commit ee1a82046e
+18 -18
View File
@@ -42,7 +42,7 @@ echo
echo echo
color_yellow color_yellow
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
echo Start OS Detection" echo " Start OS Detection"
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
color_reset color_reset
echo echo
@@ -84,8 +84,8 @@ if [[ -n "$OS" ]]; then
else else
color_red color_red
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
printf "ERROR: Unsupported or unknown Linux distribution." printf "ERROR: Unsupported or unknown Linux distribution.\n"
printf "Detected: ID=$OS_ID, ID_LIKE=${OS_LIKE:-empty}" printf "Detected: ID=%s, ID_LIKE=%s\n" "$OS_ID" "${OS_LIKE:-empty}"
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
color_reset color_reset
exit 1 exit 1
@@ -116,12 +116,12 @@ if [[ -n "$DE" ]]; then
echo echo
color_cyan color_cyan
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
printf "Detected Desktop Environment: $DE (${DE_RAW})" printf "Detected Desktop Environment: %s (%s)\n" "$DE" "${DE_RAW}"
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
color_reset color_reset
else else
echo echo
printf "No Desktop Environment detected. Select one to install:" printf "No Desktop Environment detected. Select one to install:\n"
while true; do while true; do
echo " 1) XFCE" echo " 1) XFCE"
echo " 2) Plasma" echo " 2) Plasma"
@@ -143,7 +143,7 @@ else
echo echo
color_cyan color_cyan
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
printf "Selected Desktop Environment: $DE" printf "Selected Desktop Environment: %s\n" "$DE"
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
color_reset color_reset
fi fi
@@ -154,14 +154,14 @@ fi
echo echo
color_yellow color_yellow
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
printf " Tiling WM Selection" printf " Tiling WM Selection\n"
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
color_reset color_reset
echo echo
while true; do while true; do
echo echo
printf "Select a tiling window manager:" printf "Select a tiling window manager:\n"
echo " 1) CHADWM" echo " 1) CHADWM"
echo " 2) Hyprland" echo " 2) Hyprland"
echo " 3) Niri" echo " 3) Niri"
@@ -182,7 +182,7 @@ done
echo echo
color_cyan color_cyan
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
printf "Selected Tiling WM: $TWM" printf "Selected Tiling WM: %s\n" "$TWM"
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
color_reset color_reset
@@ -192,14 +192,14 @@ color_reset
echo echo
color_yellow color_yellow
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
printf " Installation Level Selection" printf " Installation Level Selection\n"
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
color_reset color_reset
echo echo
while true; do while true; do
echo echo
printf "Select installation level:" printf "Select installation level:\n"
echo " 1) minimal" echo " 1) minimal"
echo " 2) full" echo " 2) full"
echo " 3) workstation" echo " 3) workstation"
@@ -220,7 +220,7 @@ done
echo echo
color_cyan color_cyan
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
printf "Selected Installation Level: $INSTALL_LEVEL" printf "Selected Installation Level: %s\n" "$INSTALL_LEVEL"
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
color_reset color_reset
@@ -244,7 +244,7 @@ case "$OS" in
*) *)
color_red color_red
echo echo
echo "No OS script available for $OS" printf "No OS script available for %s\n" "$OS"
color_reset color_reset
exit 1 exit 1
;; ;;
@@ -256,7 +256,7 @@ esac
if [[ ! -f "$OS_SCRIPT" ]]; then if [[ ! -f "$OS_SCRIPT" ]]; then
color_red color_red
echo echo
printf "ERROR: OS script not found: $OS_SCRIPT" printf "ERROR: OS script not found: %s\n" "$OS_SCRIPT"
color_reset color_reset
exit 1 exit 1
fi fi
@@ -267,12 +267,12 @@ fi
echo echo
color_cyan color_cyan
printf "Running OS script: $OS_SCRIPT" printf "Running OS script: %s\n" "$OS_SCRIPT"
color_reset color_reset
bash "$OS_SCRIPT" || { bash "$OS_SCRIPT" || {
color_red color_red
echo echo
printf "ERROR: OS script failed: $OS_SCRIPT" printf "ERROR: OS script failed: %s\n" "$OS_SCRIPT"
color_reset color_reset
exit 1 exit 1
} }
@@ -280,6 +280,6 @@ bash "$OS_SCRIPT" || {
echo echo
color_yellow color_yellow
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
printf "End Detection" printf "End Detection\n"
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
color_reset color_reset