fix(ci): load environment in patch generator

Sourced ci/env.sh in generate-brand-patch.sh to ensure VSCODE_QUALITY and other environment variables are available for get_repo.sh execution.

Author: Codesphere Developer

ci/generate-brand-patch.sh

@@ -1,43 +1,62 @@
 #!/usr/bin/env bash
 # Codesphere Patch Generator
-# This script generates the codesphere-brand.patch file by applying branding changes
-# to a clean VSCodium vscode checkout and creating a git diff.
+# Generates codesphere-brand.patch by applying branding to a clean VSCodium checkout.
+# Uses a temporary directory to avoid modifying the VSCodium submodule source.
 
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 REPO_ROOT="$SCRIPT_DIR/.."
-VSCODIUM_DIR="$REPO_ROOT/vendor/vscodium"
-VSCODE_DIR="$VSCODIUM_DIR/vscode"
+VSCODIUM_SUBMODULE="$REPO_ROOT/vendor/vscodium"
 PATCH_OUTPUT="$SCRIPT_DIR/patches/codesphere-brand.patch"
 
+# Load central environment (if not already loaded)
+if [ -f "$REPO_ROOT/ci/env.sh" ]; then
+  . "$REPO_ROOT/ci/env.sh"
+fi
+
+# Temporary workspace vars
+TEMP_ROOT="$REPO_ROOT/build_temp"
+TEMP_VSCODIUM="$TEMP_ROOT/vscodium"
+TEMP_VSCODE="$TEMP_VSCODIUM/vscode"
+
 echo "🔧 Codesphere Brand Patch Generator"
 echo "===================================="
-echo ""
+echo "Working directory: $TEMP_ROOT"
 
-# Ensure we're in a git repo
-if [ ! -d "$VSCODE_DIR/.git" ]; then
-  echo "❌ Error: $VSCODE_DIR is not a git repository"
-  echo "Please run vendor/vscodium/get_repo.sh first to initialize the vscode directory"
-  exit 1
-fi
+# Cleanup any previous run
+rm -rf "$TEMP_ROOT"
+mkdir -p "$TEMP_VSCODIUM"
 
-cd "$VSCODE_DIR" || exit 1
+# 1. Copy VSCodium scripts to temp dir (so we can fix CRLF safely)
+echo "📦 Copying VSCodium scripts to temp workspace..."
+cp -r "$VSCODIUM_SUBMODULE/"* "$TEMP_VSCODIUM/"
 
-# Make sure the working directory is clean
-if [ -n "$(git status --porcelain)" ]; then
-  echo "⚠️  Warning: vscode directory has uncommitted changes"
-  echo "Resetting to clean state..."
-  git reset --hard HEAD
-  git clean -fd
+# 2. Fix CRLF line endings in the temp scripts (crucial for Windows/WSL)
+echo "🔧 Fixing CRLF line endings in temp scripts..."
+find "$TEMP_VSCODIUM" -name "*.sh" -type f -exec sed -i 's/\r$//' {} +
+
+# 3. Fetch VS Code source using the temp scripts
+echo "📥 Fetching VS Code source (this may take time)..."
+cd "$TEMP_VSCODIUM" || exit 1
+# Force bash usage to ensuring expected behavior
+bash ./get_repo.sh
+
+# 4. Verify fetch success
+if [ ! -d "$TEMP_VSCODE/.git" ]; then
+  echo "❌ Error: Failed to fetch vscode source in temp dir"
+  exit 1
 fi
 
-echo "✅ Clean vscode checkout ready"
+echo "✅ Clean vscode checkout ready in temp dir"
 echo ""
 echo "🎨 Applying Codesphere branding changes..."
 
-# Apply all the branding replacements that were in enforce-branding.sh
-# First, github.com/VSCodium -> github.com/Codesphere
+cd "$TEMP_VSCODE" || exit 1
+
+# Apply branding replacements (Regex logic from original enforce-branding.sh)
+
+# github.com/VSCodium -> github.com/Codesphere
 find . -type f \( -name "*.ts" -o -name "*.js" -o -name "*.html" -o -name "*.json" -o -name "*.md" -o -name "*.iss" -o -name "*.xml" -o -name "*.spec.template" -o -name "*.yaml" -o -name "*.template" -o -name "*.rs" -o -name "*.isl" -o -name "*.txt" -o -name "*.toml" \) \
   -not -path "*/node_modules/*" -not -path "*/.git/*" \
   -exec perl -pi -e 's/github\.com\/VSCodium/github.com\/Codesphere/g' {} + 2>/dev/null || true
@@ -72,24 +91,26 @@ find . -type f \( -name "*.ts" -o -name "*.js" -o -name "*.html" -o -name "*.jso
   -not -path "*/node_modules/*" -not -path "*/.git/*" \
   -exec perl -pi -e 's/code\.visualstudio\.com/codesphere.com/g' {} + 2>/dev/null || true
 
-echo "✅ Branding changes applied"
+echo "✅ Branding changes applied to temp source"
 echo ""
 echo "📝 Generating patch file..."
 
-# Generate the patch
+# Generate the patch from the temp repo
 git add -A
 git diff --cached > "$PATCH_OUTPUT"
 
-# Reset the changes
-git reset --hard HEAD
-git clean -fd
-
 echo ""
 if [ -s "$PATCH_OUTPUT" ]; then
   PATCH_LINES=$(wc -l < "$PATCH_OUTPUT")
   echo "✅ Patch generated successfully!"
   echo "   File: $PATCH_OUTPUT"
   echo "   Lines: $PATCH_LINES"
+  
+  # Cleanup
+  echo "🧹 Cleaning up temp workspace..."
+  cd "$REPO_ROOT"
+  rm -rf "$TEMP_ROOT"
+  echo "✨ Done."
 else
   echo "❌ No changes detected - patch file is empty"
   exit 1