v3-revamp

main_script.sh

@@ -58,34 +58,38 @@ pause_if_debug() {
     fi
 }
 
-#------------------------------------------
-# Script Version 3.0
-#------------------------------------------
-echo
-color_yellow "----------------------------------------------------------------"
-color_yellow "Script version 3.0"
-color_yellow "----------------------------------------------------------------"
-echo
+# ==========================================
+# ADD THIS GUARD WRAPPER HERE:
+# ==========================================
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
 
-#------------------------------------------
-# OS Detection
-#------------------------------------------
-echo
-color_yellow "----------------------------------------------------------------"
-color_yellow "Start OS Detection"
-color_yellow "----------------------------------------------------------------"
-echo
+    # Put your entire interactive menu, OS detection, exports, 
+    # and the logic that runs the OS_SCRIPT inside here.
     
-source /etc/os-release
+    echo
+    color_yellow "----------------------------------------------------------------"
+    color_yellow "Script version 3.0"
+    color_yellow "----------------------------------------------------------------"
 
-OS_ID="${ID,,}"
-OS_LIKE="${ID_LIKE:-}"
-OS_LIKE="${OS_LIKE,,}"
-OS_VERSION="${VERSION_ID:-unknown}"
-OS_PRETTY="$PRETTY_NAME"
-OS=""
+    #------------------------------------------
+    # OS Detection
+    #------------------------------------------
+    echo
+    color_yellow "----------------------------------------------------------------"
+    color_yellow "Start OS Detection"
+    color_yellow "----------------------------------------------------------------"
+    echo
 
-case "$OS_ID" in
+    source /etc/os-release
+
+    OS_ID="${ID,,}"
+    OS_LIKE="${ID_LIKE:-}"
+    OS_LIKE="${OS_LIKE,,}"
+    OS_VERSION="${VERSION_ID:-unknown}"
+    OS_PRETTY="$PRETTY_NAME"
+    OS=""
+
+    case "$OS_ID" in
         arch)   OS="arch" ;;
         debian) OS="debian" ;;
         ubuntu) OS="ubuntu" ;;
@@ -101,48 +105,48 @@ case "$OS_ID" in
                 OS="fedora"
             fi
             ;;
-esac
+    esac
 
-if [[ -n "$OS" ]]; then
+    if [[ -n "$OS" ]]; then
         color_cyan "----------------------------------------------------------------"
         color_cyan "Detected OS:" "$OS_PRETTY"
         color_cyan "Version:" "$OS_VERSION"
         color_cyan "----------------------------------------------------------------"
-else
+    else
         color_red "----------------------------------------------------------------"
         color_red "ERROR: Unsupported or unknown Linux distribution."
         color_red "Detected: ID=" "$OS_ID" "ID_LIKE=" "${OS_LIKE:-empty}"
         color_red "----------------------------------------------------------------"
         exit 1
-fi
+    fi
 
-pause_if_debug
+    pause_if_debug
 
-#------------------------------------------
-# Desktop Environment Detection / Selection
-#------------------------------------------
-echo
-color_yellow "----------------------------------------------------------------"
-color_yellow "Desktop Environment Selection"
-color_yellow "----------------------------------------------------------------"
-echo
+    #------------------------------------------
+    # Desktop Environment Detection / Selection
+    #------------------------------------------
+    echo
+    color_yellow "----------------------------------------------------------------"
+    color_yellow "Desktop Environment Selection"
+    color_yellow "----------------------------------------------------------------"
+    echo
 
-DE_RAW="${XDG_CURRENT_DESKTOP:-${DESKTOP_SESSION:-}}"
-DE=""
+    DE_RAW="${XDG_CURRENT_DESKTOP:-${DESKTOP_SESSION:-}}"
+    DE=""
 
-case "${DE_RAW,,}" in
+    case "${DE_RAW,,}" in
         *xfce*)          DE="xfce" ;;
         *plasma*|*kde*)  DE="plasma" ;;
         *gnome*)         DE="gnome" ;;
         ""|none)         DE="" ;;
-esac
+    esac
 
-if [[ -n "$DE" ]]; then
+    if [[ -n "$DE" ]]; then
         echo
         color_cyan "----------------------------------------------------------------"
         color_cyan "Detected Desktop Environment:" "$DE" "${DE_RAW:-unknown}"
         color_cyan "----------------------------------------------------------------"
-else
+    else
         echo
         color_gray "No Desktop Environment detected. Select one to install:"
         echo
@@ -167,20 +171,20 @@ else
         color_cyan "----------------------------------------------------------------"
         color_cyan "Selected Desktop Environment:" "$DE"
         color_cyan "----------------------------------------------------------------"
-fi
+    fi
 
-pause_if_debug
+    pause_if_debug
 
-#------------------------------------------
-# Tiling Window Manager Selection
-#------------------------------------------
-echo
-color_yellow "----------------------------------------------------------------"
-color_yellow "Tiling WM Selection"
-color_yellow "----------------------------------------------------------------"
-echo
+    #------------------------------------------
+    # Tiling Window Manager Selection
+    #------------------------------------------
+    echo
+    color_yellow "----------------------------------------------------------------"
+    color_yellow "Tiling WM Selection"
+    color_yellow "----------------------------------------------------------------"
+    echo
 
-while true; do
+    while true; do
         echo
         color_gray "Select a tiling window manager:"
         echo
@@ -199,25 +203,25 @@ while true; do
             x|"") TWM="none"; break ;;
             *) echo "Invalid option. Please enter 1, 2, 3 or x." ;;
         esac
-done
+    done
 
-echo
-color_cyan "----------------------------------------------------------------"
-color_cyan "Selected Tiling WM:" "$TWM"
-color_cyan "----------------------------------------------------------------"
+    echo
+    color_cyan "----------------------------------------------------------------"
+    color_cyan "Selected Tiling WM:" "$TWM"
+    color_cyan "----------------------------------------------------------------"
 
-pause_if_debug
+    pause_if_debug
 
-#------------------------------------------
-# Installation Level Selection
-#------------------------------------------
-echo
-color_yellow "----------------------------------------------------------------"
-color_yellow "Installation Level Selection"
-color_yellow "----------------------------------------------------------------"
-echo
+    #------------------------------------------
+    # Installation Level Selection
+    #------------------------------------------
+    echo
+    color_yellow "----------------------------------------------------------------"
+    color_yellow "Installation Level Selection"
+    color_yellow "----------------------------------------------------------------"
+    echo
 
-while true; do
+    while true; do
         echo
         color_gray "Select installation level:"
         echo
@@ -236,28 +240,28 @@ while true; do
             4) INSTALL_LEVEL="server"; break ;;
             *) echo "Invalid option. Please enter 1, 2, 3, or 4." ;;
         esac
-done
+    done
 
-echo
-color_cyan "----------------------------------------------------------------"
-color_cyan "Selected Installation Level:" "$INSTALL_LEVEL"
-color_cyan "----------------------------------------------------------------"
+    echo
+    color_cyan "----------------------------------------------------------------"
+    color_cyan "Selected Installation Level:" "$INSTALL_LEVEL"
+    color_cyan "----------------------------------------------------------------"
 
-pause_if_debug
+    pause_if_debug
 
-#------------------------------------------
-# Export selections for OS script
-#------------------------------------------
-export DETECTED_OS="$OS"
-export DETECTED_DE="$DE_RAW"
-export SELECTED_DE="$DE"
-export SELECTED_TWM="$TWM"
-export INSTALL_LEVEL
+    #------------------------------------------
+    # Export selections for OS script
+    #------------------------------------------
+    export DETECTED_OS="$OS"
+    export DETECTED_DE="$DE_RAW"
+    export SELECTED_DE="$DE"
+    export SELECTED_TWM="$TWM"
+    export INSTALL_LEVEL
 
-#------------------------------------------
-# Determine OS script
-#------------------------------------------
-case "$OS" in
+    #------------------------------------------
+    # Determine OS script
+    #------------------------------------------
+    case "$OS" in
         debian) OS_SCRIPT="./debian/debian.sh" ;;
         ubuntu) OS_SCRIPT="./ubuntu/ubuntu.sh" ;;
         arch)   OS_SCRIPT="./arch/arch.sh" ;;
@@ -266,28 +270,33 @@ case "$OS" in
             color_red "No OS script available for $OS"
             exit 1
             ;;
-esac
+    esac
 
-#------------------------------------------
-# Preflight check & run
-#------------------------------------------
-if [[ ! -f "$OS_SCRIPT" ]]; then
+    #------------------------------------------
+    # Preflight check & run
+    #------------------------------------------
+    if [[ ! -f "$OS_SCRIPT" ]]; then
         color_red "ERROR: OS script not found: $OS_SCRIPT"
         exit 1
-fi
+    fi
 
-if [[ ! -x "$OS_SCRIPT" ]]; then
+    if [[ ! -x "$OS_SCRIPT" ]]; then
         chmod +x "$OS_SCRIPT"
-fi
+    fi
 
-echo
-color_cyan "Running OS script: $OS_SCRIPT"
-bash "$OS_SCRIPT" || {
+    echo
+    color_cyan "Running OS script: $OS_SCRIPT"
+    bash "$OS_SCRIPT" || {
         color_red "ERROR: OS script failed: $OS_SCRIPT"
         exit 1
-}
+    }
 
-echo
-color_yellow "----------------------------------------------------------------"
-color_yellow "End Detection"
-color_yellow "----------------------------------------------------------------"
+    echo
+        color_yellow "----------------------------------------------------------------"
+        color_yellow "End Detection"
+        color_yellow "----------------------------------------------------------------"
+
+# ==========================================
+# CLOSE THE GUARD WRAPPER AT THE VERY END OF THE FILE:
+# ==========================================
+fi