v3-revamp
This commit is contained in:
+9
-12
@@ -59,13 +59,10 @@ pause_if_debug() {
|
||||
}
|
||||
|
||||
# ==========================================
|
||||
# ADD THIS GUARD WRAPPER HERE:
|
||||
# GUARD WRAPPER START
|
||||
# ==========================================
|
||||
if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
|
||||
|
||||
# Put your entire interactive menu, OS detection, exports,
|
||||
# and the logic that runs the OS_SCRIPT inside here.
|
||||
|
||||
echo
|
||||
color_yellow "----------------------------------------------------------------"
|
||||
color_yellow "Script version 3.0"
|
||||
@@ -109,13 +106,13 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
|
||||
|
||||
if [[ -n "$OS" ]]; then
|
||||
color_cyan "----------------------------------------------------------------"
|
||||
color_cyan "Detected OS:" "$OS_PRETTY"
|
||||
color_cyan "Version:" "$OS_VERSION"
|
||||
color_cyan "Detected OS: $OS_PRETTY"
|
||||
color_cyan "Version: $OS_VERSION"
|
||||
color_cyan "----------------------------------------------------------------"
|
||||
else
|
||||
color_red "----------------------------------------------------------------"
|
||||
color_red "ERROR: Unsupported or unknown Linux distribution."
|
||||
color_red "Detected: ID=" "$OS_ID" "ID_LIKE=" "${OS_LIKE:-empty}"
|
||||
color_red "Detected: ID=$OS_ID ID_LIKE=${OS_LIKE:-empty}"
|
||||
color_red "----------------------------------------------------------------"
|
||||
exit 1
|
||||
fi
|
||||
@@ -144,7 +141,7 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
|
||||
if [[ -n "$DE" ]]; then
|
||||
echo
|
||||
color_cyan "----------------------------------------------------------------"
|
||||
color_cyan "Detected Desktop Environment:" "$DE" "${DE_RAW:-unknown}"
|
||||
color_cyan "Detected Desktop Environment: $DE (${DE_RAW:-unknown})"
|
||||
color_cyan "----------------------------------------------------------------"
|
||||
else
|
||||
echo
|
||||
@@ -169,7 +166,7 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
|
||||
done
|
||||
echo
|
||||
color_cyan "----------------------------------------------------------------"
|
||||
color_cyan "Selected Desktop Environment:" "$DE"
|
||||
color_cyan "Selected Desktop Environment: $DE"
|
||||
color_cyan "----------------------------------------------------------------"
|
||||
fi
|
||||
|
||||
@@ -207,7 +204,7 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
|
||||
|
||||
echo
|
||||
color_cyan "----------------------------------------------------------------"
|
||||
color_cyan "Selected Tiling WM:" "$TWM"
|
||||
color_cyan "Selected Tiling WM: $TWM"
|
||||
color_cyan "----------------------------------------------------------------"
|
||||
|
||||
pause_if_debug
|
||||
@@ -244,7 +241,7 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
|
||||
|
||||
echo
|
||||
color_cyan "----------------------------------------------------------------"
|
||||
color_cyan "Selected Installation Level:" "$INSTALL_LEVEL"
|
||||
color_cyan "Selected Installation Level: $INSTALL_LEVEL"
|
||||
color_cyan "----------------------------------------------------------------"
|
||||
|
||||
pause_if_debug
|
||||
@@ -297,6 +294,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
|
||||
color_yellow "----------------------------------------------------------------"
|
||||
|
||||
# ==========================================
|
||||
# CLOSE THE GUARD WRAPPER AT THE VERY END OF THE FILE:
|
||||
# GUARD WRAPPER END
|
||||
# ==========================================
|
||||
fi
|
||||
Reference in New Issue
Block a user