openclaw-droid 3.0.1 → 3.0.2

package/install.sh

@@ -25,37 +25,36 @@ echo -e "\n${BLUE}[1/6]${NC} Updating Termux packages..."
 export DEBIAN_FRONTEND=noninteractive
 
 # Attempt update, but don't exit if it fails (common due to repo mirrors or dependency conflicts)
-# We use -o Dpkg::Options::="--force-confnew" to automatically accept new config files
 if ! pkg update -y -o Dpkg::Options::="--force-confnew" || ! pkg upgrade -y -o Dpkg::Options::="--force-confnew"; then
     echo -e "${YELLOW}Warning: Termux package update had issues.${NC}"
     echo -e "Attempting to proceed. If installation fails, try running 'pkg remove nodejs' manually."
 fi
 
 echo -e "\n${BLUE}[2/6]${NC} Installing proot-distro..."
-# Check if proot-distro is already installed to avoid re-installation issues
 if command -v proot-distro &> /dev/null; then
     echo -e "  ${GREEN}✓${NC} proot-distro already installed."
 else
     if ! pkg install proot-distro -y; then
          echo -e "${RED}Error:${NC} Failed to install proot-distro."
-         echo -e "${YELLOW}Tip:${NC} Try running 'pkg remove nodejs' if you have dependency conflicts, then run this script again."
+         echo -e "${YELLOW}Tip:${NC} Try running 'pkg remove nodejs' if you have dependency conflicts."
          exit 1
     fi
 fi
 
-echo -e "\n${BLUE}[3/6]${NC} Installing Ubuntu container..."
-if proot-distro login ubuntu -- true >/dev/null 2>&1; then
-    echo -e "  ${GREEN}✓${NC} Ubuntu container already installed."
+echo -e "\n${BLUE}[3/6]${NC} Checking Ubuntu container..."
+# We don't skip the setup if it exists; we just ensure it's installed.
+if proot-distro list | grep -q "ubuntu (installed)"; then
+    echo -e "  ${GREEN}✓${NC} Ubuntu container found. Proceeding to configuration..."
 else
     echo -e "  ${YELLOW}Installing Ubuntu...${NC}"
     if ! proot-distro install ubuntu; then
         echo -e "${RED}Error:${NC} Failed to install Ubuntu container."
-        echo -e "Check your internet connection and disk space."
         exit 1
     fi
 fi
 
-echo -e "\n${BLUE}[4/6]${NC} Configuring auto-login..."
+echo -e "\n${BLUE}[4/6]${NC} Configuring auto-login (optional)..."
+# We won't force auto-login if the user doesn't want it, but we'll add it if missing to match user request
 if ! grep -q "proot-distro login ubuntu" ~/.bashrc; then
     echo "proot-distro login ubuntu" >> ~/.bashrc
     echo -e "  ${GREEN}✓${NC} Auto-login configured."
@@ -67,6 +66,7 @@ echo -e "\n${BLUE}[5/6]${NC} Creating internal setup script..."
 TERMUX_HOME="$HOME"
 INTERNAL_SCRIPT="$TERMUX_HOME/openclaw_internal_setup.sh"
 
+# Create the internal script that runs INSIDE Ubuntu
 cat << 'EOF' > "$INTERNAL_SCRIPT"
 #!/bin/bash
 set -e
@@ -76,76 +76,104 @@ BLUE='\033[0;34m'
 YELLOW='\033[1;33m'
 NC='\033[0m'
 
-echo -e "\n${BLUE}[6/6]${NC} Setting up OpenClaw in Ubuntu..."
+echo -e "\n${BLUE}[Internal]${NC} Configuring OpenClaw environment..."
 
-# Cleanup locks in case of previous failures
+# 1. Fix Package Manager
+echo -e "${YELLOW}Updating Ubuntu repositories...${NC}"
+export DEBIAN_FRONTEND=noninteractive
 rm -f /var/lib/dpkg/lock-frontend /var/lib/dpkg/lock
 dpkg --configure -a || true
+apt update -y
+apt upgrade -y -o Dpkg::Options::="--force-confnew"
 
-echo -e "\n${YELLOW}Updating Ubuntu packages...${NC}"
-export DEBIAN_FRONTEND=noninteractive
-apt update && apt upgrade -y -o Dpkg::Options::="--force-confnew"
-
-echo -e "\n${YELLOW}Installing dependencies...${NC}"
+# 2. Install Dependencies
+echo -e "${YELLOW}Installing core dependencies...${NC}"
 apt install curl git build-essential -y
 
-if ! command -v git &> /dev/null; then
-    echo -e "${YELLOW}Git not found after install attempt. Retrying...${NC}"
-    apt install -y git
-fi
-
-if ! command -v git &> /dev/null; then
-    echo -e "${RED}Error:${NC} Git is required by npm to install OpenClaw."
-    echo -e "${YELLOW}Tip:${NC} Ensure apt is healthy, then run: apt update && apt install -y git"
-    exit 1
-fi
-
-echo -e "\n${YELLOW}Installing Node.js 22 from NodeSource...${NC}"
-# Check if already installed
+# 3. Install Node.js 22
+echo -e "${YELLOW}Installing Node.js 22...${NC}"
 if ! command -v node &> /dev/null; then
     curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
     apt install -y nodejs
 else
-    echo -e "  ${GREEN}✓${NC} Node.js already installed."
+    echo -e "  ${GREEN}✓${NC} Node.js $(node -v) is installed."
 fi
 
-echo -e "\n${YELLOW}Installing OpenClaw globally (npm may call git)...${NC}"
+# 4. Install OpenClaw
+echo -e "${YELLOW}Installing OpenClaw global package...${NC}"
 npm install -g openclaw@latest
 
-echo -e "\n${YELLOW}Creating network interface patch...${NC}"
-cat << 'JS' > /root/hijack.js
+# Verify installation path
+if ! command -v openclaw &> /dev/null; then
+    echo -e "${YELLOW}Warning: 'openclaw' command not found in PATH.${NC}"
+    echo -e "Searching for binary..."
+    POSSIBLE_PATH=$(find / -name openclaw -type l 2>/dev/null | head -n 1)
+    if [ -n "$POSSIBLE_PATH" ]; then
+        echo -e "Found at: $POSSIBLE_PATH"
+        ln -sf "$POSSIBLE_PATH" /usr/bin/openclaw
+        echo -e "${GREEN}✓${NC} Symlinked to /usr/bin/openclaw"
+    else
+        echo -e "${RED}Error:${NC} Could not find openclaw binary. Installation may have failed."
+    fi
+fi
+
+# 5. Create Bionic Bypass (Patch)
+echo -e "${YELLOW}Creating network interface patch (patch.js)...${NC}"
+cat << 'JS' > /root/patch.js
 const os = require('os');
-os.networkInterfaces = () => ({});
+os.networkInterfaces = function() {
+  return {
+    "lo": [
+      {
+        "address": "127.0.0.1",
+        "netmask": "255.0.0.0",
+        "family": "IPv4",
+        "mac": "00:00:00:00:00:00",
+        "internal": true,
+        "cidr": "127.0.0.1/8"
+      }
+    ]
+  };
+};
 JS
 
-echo -e "\n${YELLOW}Configuring environment...${NC}"
-if ! grep -q "NODE_OPTIONS" /root/.bashrc; then
-    echo 'export NODE_OPTIONS="-r /root/hijack.js"' >> /root/.bashrc
+# 6. Configure Environment
+echo -e "${YELLOW}Configuring environment variables...${NC}"
+# Add to .bashrc if not present
+if ! grep -q "patch.js" /root/.bashrc; then
+    echo 'export NODE_OPTIONS="--require /root/patch.js"' >> /root/.bashrc
 fi
-
-# Ensure persistent loading
-if ! grep -q "source /root/.bashrc" /root/.profile 2>/dev/null; then
-    echo "source /root/.bashrc" >> /root/.profile
+# Add to .profile for good measure
+if ! grep -q "patch.js" /root/.profile; then
+    echo 'export NODE_OPTIONS="--require /root/patch.js"' >> /root/.profile
 fi
 
-echo -e "\n${GREEN}Starting OpenClaw onboarding...${NC}"
-echo -e "${YELLOW}IMPORTANT: Select 'Loopback (127.0.0.1)' for Gateway Bind to avoid crashes!${NC}"
-export NODE_OPTIONS="-r /root/hijack.js"
-openclaw onboard || echo -e "${YELLOW}Onboarding skipped or already completed.${NC}"
+# Apply immediately for this session
+export NODE_OPTIONS="--require /root/patch.js"
+
+echo -e "\n${GREEN}Starting OpenClaw Onboarding...${NC}"
+echo -e "${YELLOW}IMPORTANT: Select 'Loopback (127.0.0.1)' for Gateway Bind!${NC}"
+
+# Run onboarding if user wants, or they can do it later.
+# We'll try running it. If it fails (e.g. user cancels), we don't want the script to exit with error.
+openclaw onboard || echo -e "${YELLOW}Onboarding finished or skipped.${NC}"
 
 echo -e "\n${GREEN}╔═══════════════════════════════════════════╗${NC}"
 echo -e "${GREEN}║        INSTALLATION COMPLETE!             ║${NC}"
 echo -e "${GREEN}╚═══════════════════════════════════════════╝${NC}"
+echo -e "Type ${BLUE}openclaw gateway${NC} to start."
 EOF
 
 chmod +x "$INTERNAL_SCRIPT"
 
-echo -e "\n${BLUE}Entering Ubuntu container to run setup...${NC}"
-# Run the internal script
-# Force run even if container is running/installed
+echo -e "\n${BLUE}[6/6]${NC} Entering Ubuntu to finalize setup..."
+echo -e "Please wait while we configure the container..."
+
+# Run the internal script inside Ubuntu
+# We bind the home directory to access the script
 proot-distro login ubuntu --bind "$TERMUX_HOME":/mnt/termux -- bash /mnt/termux/openclaw_internal_setup.sh
 
-echo -e "\n${GREEN}Cleaning up temporary files...${NC}"
+echo -e "\n${GREEN}Cleaning up...${NC}"
 rm -f "$INTERNAL_SCRIPT"
 
 echo -e "\n${BLUE}Logging you into Ubuntu now...${NC}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-droid",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "OpenClaw Droid - Android AI Gateway Installer with proot-distro Ubuntu",
   "files": [
     "install.sh",