openclaw-droid 3.0.2 → 3.0.5

package/install.sh

@@ -21,13 +21,11 @@ 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)
 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..."
@@ -36,15 +34,22 @@ if command -v proot-distro &> /dev/null; then
 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."
          exit 1
     fi
 fi
 
 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..."
+UBUNTU_INSTALLED="false"
+if proot-distro list 2>/dev/null | grep -qE '(^|[[:space:]])ubuntu([[:space:]]|$)'; then
+    UBUNTU_INSTALLED="true"
+fi
+
+if [ "$UBUNTU_INSTALLED" = "true" ]; then
+    if proot-distro login ubuntu -- true 2>/dev/null; then
+        echo -e "  ${GREEN}✓${NC} Ubuntu is already installed and working. Skipping installation."
+    else
+        echo -e "  ${YELLOW}Ubuntu is already installed but login failed. Continuing setup...${NC}"
+    fi
 else
     echo -e "  ${YELLOW}Installing Ubuntu...${NC}"
     if ! proot-distro install ubuntu; then
@@ -54,7 +59,6 @@ else
 fi
 
 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."
@@ -66,33 +70,37 @@ 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
+# 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}[Internal]${NC} Configuring OpenClaw environment..."
 
-# 1. Fix Package Manager
-echo -e "${YELLOW}Updating Ubuntu repositories...${NC}"
+# 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
-apt update -y
-apt upgrade -y -o Dpkg::Options::="--force-confnew"
+# 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}"
 
 # 2. Install Dependencies
 echo -e "${YELLOW}Installing core dependencies...${NC}"
-apt install curl git build-essential -y
+apt install curl git build-essential -y || echo -e "${YELLOW}Warning: Dependencies install had issues...${NC}"
 
 # 3. Install Node.js 22
-echo -e "${YELLOW}Installing Node.js 22...${NC}"
+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
@@ -100,24 +108,61 @@ else
 fi
 
 # 4. Install OpenClaw
-echo -e "${YELLOW}Installing OpenClaw global package...${NC}"
-npm install -g openclaw@latest
-
-# 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."
+echo -e "${YELLOW}Installing/Updating OpenClaw global package...${NC}"
+# Use --force to ensure it overwrites if broken
+npm install -g openclaw@latest --force
+
+# 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
 
-# 5. Create Bionic Bypass (Patch)
+# 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
+
+# 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
+
+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
+
+# 6. Create Bionic Bypass (Patch)
 echo -e "${YELLOW}Creating network interface patch (patch.js)...${NC}"
 cat << 'JS' > /root/patch.js
 const os = require('os');
@@ -137,30 +182,26 @@ os.networkInterfaces = function() {
 };
 JS
 
-# 6. Configure Environment
+# 7. 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
-# 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
-
-# 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.
+# 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
 
@@ -169,9 +210,10 @@ chmod +x "$INTERNAL_SCRIPT"
 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
+# 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...${NC}"
 rm -f "$INTERNAL_SCRIPT"

package/package.json

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