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