v3-fedora-renew
This commit is contained in:
+17
-17
@@ -77,15 +77,15 @@ esac
|
||||
if [[ -n "$OS" ]]; then
|
||||
color_cyan
|
||||
echo "----------------------------------------------------------------"
|
||||
echo "Detected OS: $OS ($OS_PRETTY)"
|
||||
echo "Version: $OS_VERSION"
|
||||
printf "Detected OS: %s (%s)\n" "$OS" "$OS_PRETTY"
|
||||
printf "Version: %s\n" "$OS_VERSION"
|
||||
echo "----------------------------------------------------------------"
|
||||
color_reset
|
||||
else
|
||||
color_red
|
||||
echo "----------------------------------------------------------------"
|
||||
echo "ERROR: Unsupported or unknown Linux distribution."
|
||||
echo "Detected: ID=$OS_ID, ID_LIKE=${OS_LIKE:-empty}"
|
||||
printf "ERROR: Unsupported or unknown Linux distribution."
|
||||
printf "Detected: ID=$OS_ID, ID_LIKE=${OS_LIKE:-empty}"
|
||||
echo "----------------------------------------------------------------"
|
||||
color_reset
|
||||
exit 1
|
||||
@@ -116,12 +116,12 @@ if [[ -n "$DE" ]]; then
|
||||
echo
|
||||
color_cyan
|
||||
echo "----------------------------------------------------------------"
|
||||
echo "Detected Desktop Environment: $DE (${DE_RAW})"
|
||||
printf "Detected Desktop Environment: $DE (${DE_RAW})"
|
||||
echo "----------------------------------------------------------------"
|
||||
color_reset
|
||||
else
|
||||
echo
|
||||
echo "No Desktop Environment detected. Select one to install:"
|
||||
printf "No Desktop Environment detected. Select one to install:"
|
||||
while true; do
|
||||
echo " 1) XFCE"
|
||||
echo " 2) Plasma"
|
||||
@@ -143,7 +143,7 @@ else
|
||||
echo
|
||||
color_cyan
|
||||
echo "----------------------------------------------------------------"
|
||||
echo "Selected Desktop Environment: $DE"
|
||||
printf "Selected Desktop Environment: $DE"
|
||||
echo "----------------------------------------------------------------"
|
||||
color_reset
|
||||
fi
|
||||
@@ -154,14 +154,14 @@ fi
|
||||
echo
|
||||
color_yellow
|
||||
echo "----------------------------------------------------------------"
|
||||
echo " Tiling WM Selection"
|
||||
printf " Tiling WM Selection"
|
||||
echo "----------------------------------------------------------------"
|
||||
color_reset
|
||||
echo
|
||||
|
||||
while true; do
|
||||
echo
|
||||
echo "Select a tiling window manager:"
|
||||
printf "Select a tiling window manager:"
|
||||
echo " 1) CHADWM"
|
||||
echo " 2) Hyprland"
|
||||
echo " 3) Niri"
|
||||
@@ -182,7 +182,7 @@ done
|
||||
echo
|
||||
color_cyan
|
||||
echo "----------------------------------------------------------------"
|
||||
echo "Selected Tiling WM: $TWM"
|
||||
printf "Selected Tiling WM: $TWM"
|
||||
echo "----------------------------------------------------------------"
|
||||
color_reset
|
||||
|
||||
@@ -192,14 +192,14 @@ color_reset
|
||||
echo
|
||||
color_yellow
|
||||
echo "----------------------------------------------------------------"
|
||||
echo " Installation Level Selection"
|
||||
printf " Installation Level Selection"
|
||||
echo "----------------------------------------------------------------"
|
||||
color_reset
|
||||
echo
|
||||
|
||||
while true; do
|
||||
echo
|
||||
echo "Select installation level:"
|
||||
printf "Select installation level:"
|
||||
echo " 1) minimal"
|
||||
echo " 2) full"
|
||||
echo " 3) workstation"
|
||||
@@ -220,7 +220,7 @@ done
|
||||
echo
|
||||
color_cyan
|
||||
echo "----------------------------------------------------------------"
|
||||
echo "Selected Installation Level: $INSTALL_LEVEL"
|
||||
printf "Selected Installation Level: $INSTALL_LEVEL"
|
||||
echo "----------------------------------------------------------------"
|
||||
color_reset
|
||||
|
||||
@@ -256,7 +256,7 @@ esac
|
||||
if [[ ! -f "$OS_SCRIPT" ]]; then
|
||||
color_red
|
||||
echo
|
||||
echo "ERROR: OS script not found: $OS_SCRIPT"
|
||||
printf "ERROR: OS script not found: $OS_SCRIPT"
|
||||
color_reset
|
||||
exit 1
|
||||
fi
|
||||
@@ -267,12 +267,12 @@ fi
|
||||
|
||||
echo
|
||||
color_cyan
|
||||
echo "Running OS script: $OS_SCRIPT"
|
||||
printf "Running OS script: $OS_SCRIPT"
|
||||
color_reset
|
||||
bash "$OS_SCRIPT" || {
|
||||
color_red
|
||||
echo
|
||||
echo "ERROR: OS script failed: $OS_SCRIPT"
|
||||
printf "ERROR: OS script failed: $OS_SCRIPT"
|
||||
color_reset
|
||||
exit 1
|
||||
}
|
||||
@@ -280,6 +280,6 @@ bash "$OS_SCRIPT" || {
|
||||
echo
|
||||
color_yellow
|
||||
echo "----------------------------------------------------------------"
|
||||
echo "End Detection"
|
||||
printf "End Detection"
|
||||
echo "----------------------------------------------------------------"
|
||||
color_reset
|
||||
|
||||
Reference in New Issue
Block a user