From 6b46cbafcdfc6a7d961f96fddcaba93093e06bed Mon Sep 17 00:00:00 2001
From: master3395 <master3395@users.noreply.github.com>
Date: Mon, 26 Jan 2026 20:43:17 +0100
Subject: [PATCH] Fix OS variable passing to dependency manager - export
 variables and add safety checks

---
 install.sh | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index c487174e9..26f43b6b9 100644
--- a/install.sh
+++ b/install.sh
@@ -144,11 +144,18 @@ detect_operating_system() {
     print_status "$BLUE" "🔍 Detecting operating system..."
     
     if detect_os; then
-        # Get OS information
-        eval $(get_os_info)
+        # Variables are set by detect_os() in the sourced module
+        # Export them to ensure they're available to all functions
+        export SERVER_OS OS_FAMILY PACKAGE_MANAGER ARCHITECTURE
         print_status "$GREEN" "✅ OS detected: $SERVER_OS ($OS_FAMILY)"
         print_status "$GREEN" "✅ Package manager: $PACKAGE_MANAGER"
         print_status "$GREEN" "✅ Architecture: $ARCHITECTURE"
+        
+        # Verify variables are set
+        if [ -z "$SERVER_OS" ] || [ -z "$OS_FAMILY" ] || [ -z "$PACKAGE_MANAGER" ]; then
+            print_status "$RED" "❌ OS variables not properly set after detection"
+            return 1
+        fi
         return 0
     else
         print_status "$RED" "❌ Failed to detect operating system"
@@ -160,6 +167,19 @@ detect_operating_system() {
 install_dependencies() {
     print_status "$BLUE" "📦 Installing dependencies..."
     
+    # Ensure variables are set (they should be from detect_operating_system)
+    if [ -z "$SERVER_OS" ] || [ -z "$OS_FAMILY" ] || [ -z "$PACKAGE_MANAGER" ]; then
+        print_status "$RED" "❌ OS variables not set. SERVER_OS=$SERVER_OS, OS_FAMILY=$OS_FAMILY, PACKAGE_MANAGER=$PACKAGE_MANAGER"
+        # Try to get them again
+        if detect_os; then
+            eval $(get_os_info)
+            export SERVER_OS OS_FAMILY PACKAGE_MANAGER ARCHITECTURE
+        else
+            print_status "$RED" "❌ Failed to detect OS for dependency installation"
+            return 1
+        fi
+    fi
+    
     if manage_dependencies "$SERVER_OS" "$OS_FAMILY" "$PACKAGE_MANAGER"; then
         print_status "$GREEN" "✅ Dependencies installed successfully"
         return 0