openclaw-droid 3.0.1 → 3.0.4

package/install.sh

@@ -21,41 +21,35 @@ if [ -z "$TERMUX_VERSION" ]; then
 fi
 
 echo -e "\n${BLUE}[1/6]${NC} Updating Termux packages..."
-# Set non-interactive mode to avoid prompts
 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."
+    echo -e "Attempting to proceed..."
 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."
          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..."
+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)..."
 if ! grep -q "proot-distro login ubuntu" ~/.bashrc; then
     echo "proot-distro login ubuntu" >> ~/.bashrc
     echo -e "  ${GREEN}✓${NC} Auto-login configured."
@@ -69,83 +63,150 @@ INTERNAL_SCRIPT="$TERMUX_HOME/openclaw_internal_setup.sh"
 
 cat << 'EOF' > "$INTERNAL_SCRIPT"
 #!/bin/bash
+# We use set -e to stop on errors, but we will catch them where possible
 set -e
 
 GREEN='\033[0;32m'
 BLUE='\033[0;34m'
 YELLOW='\033[1;33m'
+RED='\033[0;31m'
 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 & Clean Environment
+echo -e "${YELLOW}Updating Ubuntu repositories & cleaning up...${NC}"
+export DEBIAN_FRONTEND=noninteractive
 rm -f /var/lib/dpkg/lock-frontend /var/lib/dpkg/lock
 dpkg --configure -a || true
+# Allow apt update/upgrade to fail without killing the script (e.g. temporary network issues)
+apt update -y || echo -e "${YELLOW}Warning: 'apt update' returned error, proceeding anyway...${NC}"
+apt upgrade -y -o Dpkg::Options::="--force-confnew" || echo -e "${YELLOW}Warning: 'apt upgrade' returned error, proceeding anyway...${NC}"
 
-echo -e "\n${YELLOW}Updating Ubuntu packages...${NC}"
-export DEBIAN_FRONTEND=noninteractive
-apt update && apt upgrade -y -o Dpkg::Options::="--force-confnew"
+# 2. Install Dependencies
+echo -e "${YELLOW}Installing core dependencies...${NC}"
+apt install curl git build-essential -y || echo -e "${YELLOW}Warning: Dependencies install had issues...${NC}"
+
+# 3. Install Node.js 22
+echo -e "${YELLOW}Checking Node.js...${NC}"
+# Check if node exists and is recent enough?
+if ! command -v node &> /dev/null; then
+    echo -e "${YELLOW}Installing Node.js 22...${NC}"
+    curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
+    apt install -y nodejs
+else
+    echo -e "  ${GREEN}✓${NC} Node.js $(node -v) is installed."
+fi
 
-echo -e "\n${YELLOW}Installing dependencies...${NC}"
-apt install curl git build-essential -y
+# 4. Install OpenClaw
+echo -e "${YELLOW}Installing/Updating OpenClaw global package...${NC}"
+# Use --force to ensure it overwrites if broken
+npm install -g openclaw@latest --force
 
-if ! command -v git &> /dev/null; then
-    echo -e "${YELLOW}Git not found after install attempt. Retrying...${NC}"
-    apt install -y git
+# 5. PATH FIXING
+echo -e "${YELLOW}Fixing 'openclaw' command visibility...${NC}"
+
+# Determine where npm installs global binaries
+NPM_PREFIX=$(npm prefix -g 2>/dev/null || echo "/usr")
+NPM_BIN="$NPM_PREFIX/bin"
+
+# Fallback check
+if [ ! -d "$NPM_BIN" ]; then
+    # Try common locations
+    if [ -d "/usr/lib/node_modules/.bin" ]; then
+        NPM_BIN="/usr/lib/node_modules/.bin"
+    fi
 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
+# Ensure it's in PATH
+if [ -d "$NPM_BIN" ] && [[ ":$PATH:" != *":$NPM_BIN:"* ]]; then
+    echo "export PATH=\$PATH:$NPM_BIN" >> /root/.bashrc
+    echo "export PATH=\$PATH:$NPM_BIN" >> /root/.profile
 fi
 
-echo -e "\n${YELLOW}Installing Node.js 22 from NodeSource...${NC}"
-# Check if already installed
-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."
+# Symlink Creation
+BIN_LOCATIONS=("/usr/bin" "/bin" "/usr/local/bin")
+TARGET_BIN=""
+
+# Look for the binary
+if [ -f "$NPM_BIN/openclaw" ]; then
+    TARGET_BIN="$NPM_BIN/openclaw"
+elif [ -f "$NPM_PREFIX/lib/node_modules/openclaw/bin/openclaw.js" ]; then
+    TARGET_BIN="$NPM_PREFIX/lib/node_modules/openclaw/bin/openclaw.js"
+elif [ -f "/usr/lib/node_modules/openclaw/bin/openclaw.js" ]; then
+    TARGET_BIN="/usr/lib/node_modules/openclaw/bin/openclaw.js"
 fi
 
-echo -e "\n${YELLOW}Installing OpenClaw globally (npm may call git)...${NC}"
-npm install -g openclaw@latest
+if [ -n "$TARGET_BIN" ] && [ -f "$TARGET_BIN" ]; then
+    echo -e "  Found binary at: $TARGET_BIN"
+    chmod +x "$TARGET_BIN"
+    for LOC in "${BIN_LOCATIONS[@]}"; do
+        if [ -d "$LOC" ]; then
+            # Remove existing symlink or file if it exists
+            rm -f "$LOC/openclaw"
+            ln -s "$TARGET_BIN" "$LOC/openclaw"
+            echo -e "  Linked to $LOC/openclaw"
+        fi
+    done
+else
+    echo -e "${YELLOW}Warning: Could not locate 'openclaw' binary automatically.${NC}"
+    echo -e "You may need to add npm bin to your PATH manually."
+fi
 
-echo -e "\n${YELLOW}Creating network interface patch...${NC}"
-cat << 'JS' > /root/hijack.js
+# 6. 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
+# 7. Configure Environment
+echo -e "${YELLOW}Configuring environment variables...${NC}"
+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
+if ! grep -q "patch.js" /root/.profile; then
+    echo 'export NODE_OPTIONS="--require /root/patch.js"' >> /root/.profile
 fi
+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}"
 
-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}"
+# Run onboarding
+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 "You are now being logged into Ubuntu."
+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
-proot-distro login ubuntu --bind "$TERMUX_HOME":/mnt/termux -- bash /mnt/termux/openclaw_internal_setup.sh
+echo -e "\n${BLUE}[6/6]${NC} Entering Ubuntu to finalize setup..."
+echo -e "Please wait while we configure the container..."
+
+# Execute internal script
+if ! proot-distro login ubuntu --bind "$TERMUX_HOME":/mnt/termux -- bash /mnt/termux/openclaw_internal_setup.sh; then
+    echo -e "${YELLOW}Setup script encountered errors but finished.${NC}"
+fi
 
-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.4",
   "description": "OpenClaw Droid - Android AI Gateway Installer with proot-distro Ubuntu",
   "files": [
     "install.sh",