From d2251fb4d819aff074e2500234adbff06fb314fe Mon Sep 17 00:00:00 2001
From: techartdev <admin@techart.bg>
Date: Tue, 3 Feb 2026 10:19:42 +0200
Subject: [PATCH] Add brew wrapper script and install sudo in Dockerfile;
 update version to 0.5.30

---
 openclaw_assistant/Dockerfile      | 18 +++++++++++++-----
 openclaw_assistant/brew-wrapper.sh | 19 +++++++++++++++++++
 openclaw_assistant/config.yaml     |  2 +-
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 openclaw_assistant/brew-wrapper.sh

diff --git a/openclaw_assistant/Dockerfile b/openclaw_assistant/Dockerfile
index 6b1a046..6e56de2 100644
--- a/openclaw_assistant/Dockerfile
+++ b/openclaw_assistant/Dockerfile
@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     nginx \
     gnupg \
     build-essential \
+    sudo \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
@@ -51,21 +52,28 @@ RUN useradd -m -s /bin/bash linuxbrew \
  && chown -R linuxbrew:linuxbrew /home/linuxbrew
 
 USER linuxbrew
-RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" \
+ && cd /home/linuxbrew/.linuxbrew/Homebrew \
+ && git config --global --add safe.directory /home/linuxbrew/.linuxbrew/Homebrew \
+ && /home/linuxbrew/.linuxbrew/bin/brew update --force
 USER root
 
-# Add Homebrew to PATH for all users
-ENV PATH="/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:${PATH}"
+# Add Homebrew to PATH for all users (wrapper comes first to intercept root calls)
+ENV PATH="/usr/local/bin:/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:${PATH}"
+
+# Copy brew wrapper that allows root to run brew by delegating to linuxbrew user
+COPY brew-wrapper.sh /usr/local/bin/brew
+RUN chmod +x /usr/local/bin/brew
 
 # Verify brew is available and install gcc (needed for compiling some brew packages)
 # Must run as linuxbrew user - Homebrew refuses to run as root
 USER linuxbrew
-RUN brew --version && brew install gcc
+RUN /home/linuxbrew/.linuxbrew/bin/brew --version && /home/linuxbrew/.linuxbrew/bin/brew install gcc
 USER root
 
 # Install OpenClaw globally
 RUN npm config set fund false && npm config set audit false \
- && npm install -g openclaw@2026.1.30
+ && npm install -g openclaw@2026.2.1
 
 COPY run.sh /run.sh
 COPY oc_config_helper.py /oc_config_helper.py
diff --git a/openclaw_assistant/brew-wrapper.sh b/openclaw_assistant/brew-wrapper.sh
new file mode 100644
index 0000000..e996d56
--- /dev/null
+++ b/openclaw_assistant/brew-wrapper.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# Wrapper script for brew that runs as linuxbrew user when called by root
+# This is needed because Homebrew refuses to run as root
+
+REAL_BREW="/home/linuxbrew/.linuxbrew/bin/brew"
+
+if [ "$(id -u)" = "0" ]; then
+    # Running as root - use sudo to run as linuxbrew user
+    # Preserve necessary environment variables and properly pass all arguments
+    exec sudo -u linuxbrew \
+        HOMEBREW_NO_AUTO_UPDATE="${HOMEBREW_NO_AUTO_UPDATE:-1}" \
+        HOMEBREW_NO_ANALYTICS="${HOMEBREW_NO_ANALYTICS:-1}" \
+        HOME="/home/linuxbrew" \
+        PATH="/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:$PATH" \
+        "$REAL_BREW" "$@"
+else
+    # Not root - run directly
+    exec "$REAL_BREW" "$@"
+fi
diff --git a/openclaw_assistant/config.yaml b/openclaw_assistant/config.yaml
index 3eb3b45..02b1d44 100644
--- a/openclaw_assistant/config.yaml
+++ b/openclaw_assistant/config.yaml
@@ -1,5 +1,5 @@
 name: OpenClaw Assistant
-version: "0.5.29"
+version: "0.5.30"
 slug: openclaw_assistant
 description: Run OpenClaw Assistant (OpenClaw-compatible) as a Home Assistant add-on.
 url: https://github.com/techartdev/OpenClawHomeAssistant