From edfa7e4ebff9df21b62dead2221afc02ac7cb400 Mon Sep 17 00:00:00 2001
From: Android ROM Builder <buildkite@example.com>
Date: Mon, 30 Jun 2025 01:59:25 +0200
Subject: [PATCH] Fix: Package installation variable expansion issues

- Replaced complex array expansion with direct package lists
- Avoided eval and complex variable substitution that failed in Buildkite
- Split packages into logical groups for better readability
- Fixed empty variable issue in package installation
---
 .buildkite/pipeline.yml | 39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 96f25e2..a7801c0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -237,38 +237,21 @@ steps:
       # Install core dependencies in optimized batches
       echo "🛠️ Installing Android build dependencies..."
       
-      # Core system tools
-      CORE_PACKAGES=(
-        "git" "curl" "wget" "python3" "python3-pip" "python-is-python3"
-        "build-essential" "libc6-dev" "libssl-dev" "pkg-config"
-      )
+      # Install packages directly to avoid array expansion issues
+      echo "📥 Installing core system tools..."
+      retry_command "$$SUDO_CMD apt-get install -y git curl wget python3 python3-pip python-is-python3 build-essential libc6-dev libssl-dev pkg-config" 2>&1 | tee -a "$$INSTALL_LOG"
       
-      # Java development environment
-      JAVA_PACKAGES=(
-        "openjdk-8-jdk" "openjdk-11-jdk" "openjdk-17-jdk"
-      )
+      echo "📥 Installing Java development environment..."
+      retry_command "$$SUDO_CMD apt-get install -y openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk" 2>&1 | tee -a "$$INSTALL_LOG"
       
-      # Android-specific libraries
-      ANDROID_PACKAGES=(
-        "libncurses5" "libncurses5-dev" "lib32ncurses5-dev"
-        "libreadline-dev" "lib32readline-dev" "libtinfo5"
-        "libxml2-utils" "xsltproc" "zip" "unzip"
-        "zlib1g-dev" "lib32z1-dev" "liblz4-tool"
-      )
+      echo "📥 Installing Android-specific libraries..."
+      retry_command "$$SUDO_CMD apt-get install -y libncurses5 libncurses5-dev lib32ncurses5-dev libreadline-dev lib32readline-dev libtinfo5" 2>&1 | tee -a "$$INSTALL_LOG"
       
-      # Build optimization tools
-      BUILD_PACKAGES=(
-        "ccache" "schedtool" "bc" "bison" "flex"
-        "g++-multilib" "gcc-multilib" "rsync"
-        "squashfs-tools" "python3-mako" "libffi-dev"
-      )
+      echo "📥 Installing XML and compression tools..."
+      retry_command "$$SUDO_CMD apt-get install -y libxml2-utils xsltproc zip unzip zlib1g-dev lib32z1-dev liblz4-tool" 2>&1 | tee -a "$$INSTALL_LOG"
       
-      # Install packages in batches
-      for package_set in "CORE_PACKAGES[@]" "JAVA_PACKAGES[@]" "ANDROID_PACKAGES[@]" "BUILD_PACKAGES[@]"; do
-        eval "packages=(\$${package_set})"
-        echo "📥 Installing package set: $${packages[*]}"
-        retry_command "$$SUDO_CMD apt-get install -y $${packages[*]}" 2>&1 | tee -a "$$INSTALL_LOG"
-      done
+      echo "📥 Installing build optimization tools..."
+      retry_command "$$SUDO_CMD apt-get install -y ccache schedtool bc bison flex g++-multilib gcc-multilib rsync squashfs-tools python3-mako libffi-dev" 2>&1 | tee -a "$$INSTALL_LOG"
       
       # Configure Java environment for Android builds
       echo "☕ Configuring Java environment..."