openclawsetup 2.4.5 → 2.4.7

package/bin/cli.mjs

@@ -148,20 +148,62 @@ function checkNodeVersion() {
 
 function needsSudo() {
   const os = platform();
-  if (os === 'win32' || os === 'darwin') return false;
+  if (os === 'win32') return false;
 
-  try {
-    const testDir = '/usr/lib/node_modules';
-    if (existsSync(testDir)) {
-      accessSync(testDir, fsConstants.W_OK);
-      return false;
+  // 获取 npm 全局安装目录并检查写权限
+  const npmPrefixResult = safeExec('npm prefix -g');
+  if (npmPrefixResult.ok && npmPrefixResult.output) {
+    const globalDir = join(npmPrefixResult.output.trim(), 'lib', 'node_modules');
+    try {
+      if (existsSync(globalDir)) {
+        accessSync(globalDir, fsConstants.W_OK);
+        return false;
+      }
+      // 目录不存在，检查父目录
+      const parentDir = npmPrefixResult.output.trim();
+      if (existsSync(parentDir)) {
+        accessSync(parentDir, fsConstants.W_OK);
+        return false;
+      }
+    } catch {
+      return true;
+    }
+  }
+
+  // 回退检查
+  const testDirs = os === 'darwin'
+    ? ['/usr/local/lib/node_modules', '/opt/homebrew/lib/node_modules']
+    : ['/usr/lib/node_modules'];
+  for (const testDir of testDirs) {
+    try {
+      if (existsSync(testDir)) {
+        accessSync(testDir, fsConstants.W_OK);
+        return false;
+      }
+    } catch {
+      return true;
     }
-  } catch {
-    return true;
   }
   return true;
 }
 
+function fixNpmCacheOwnership() {
+  // sudo npm install 会把 ~/.npm 的文件 owner 改成 root
+  // 导致后续普通用户的 npx 无法写缓存（EACCES）
+  if (platform() === 'win32') return;
+  const npmCacheDir = join(homedir(), '.npm');
+  if (!existsSync(npmCacheDir)) return;
+  try {
+    accessSync(npmCacheDir, fsConstants.W_OK);
+  } catch {
+    const user = process.env.USER || process.env.LOGNAME;
+    if (user) {
+      log.hint('修复 npm 缓存目录权限...');
+      safeExec(`sudo chown -R ${user} "${npmCacheDir}"`);
+    }
+  }
+}
+
 function detectExistingInstall() {
   const home = homedir();
   const openclawDir = join(home, '.openclaw');
@@ -397,7 +439,8 @@ async function installOpenClaw() {
   console.log(colors.bold(colors.cyan('\n[1/2] 安装 OpenClaw CLI\n')));
 
   if (useSudo) {
-    log.hint('Linux 系统需要 sudo 权限安装全局包');
+    const osName = platform() === 'darwin' ? 'macOS' : 'Linux';
+    log.hint(`${osName} 系统需要 sudo 权限安装全局包`);
     console.log(colors.yellow('\n请运行以下命令：'));
     console.log(colors.green('  sudo npm install -g openclaw@latest\n'));
 
@@ -410,10 +453,11 @@ async function installOpenClaw() {
       process.exit(1);
     }
     log.success(`OpenClaw 已安装: ${check.output}`);
+    fixNpmCacheOwnership();
     return 'openclaw';
   }
 
-  // macOS 或有权限的 Linux：直接安装
+  // 有权限：直接安装
   console.log(colors.gray('正在安装 openclaw...\n'));
 
   const result = spawnSync('npm', ['install', '-g', 'openclaw@latest'], {
@@ -426,6 +470,20 @@ async function installOpenClaw() {
     return 'openclaw';
   }
 
+  // 安装失败，可能是权限问题，尝试 sudo（非 Windows）
+  if (platform() !== 'win32') {
+    log.warn('安装失败，可能是权限不足，尝试使用 sudo...');
+    const sudoResult = spawnSync('sudo', ['npm', 'install', '-g', 'openclaw@latest'], {
+      stdio: 'inherit',
+      shell: true,
+    });
+    if (sudoResult.status === 0) {
+      fixNpmCacheOwnership();
+      log.success('OpenClaw CLI 安装完成（sudo）');
+      return 'openclaw';
+    }
+  }
+
   // 尝试 clawdbot
   log.warn('openclaw 安装失败，尝试 clawdbot...');
   const fallback = spawnSync('npm', ['install', '-g', 'clawdbot@latest'], {

package/install.sh

@@ -258,6 +258,7 @@ install_node() {
     # 验证安装
     if command -v node &> /dev/null; then
         log_success "Node.js 安装完成: $(node -v)"
+        fix_npm_cache_ownership
     else
         log_error "Node.js 安装失败"
         echo ""
@@ -401,6 +402,22 @@ show_installed_info() {
     echo "  飞书:    npx openclaw-chat-cn@latest feishu"
 }
 
+# 修复 npm 缓存目录权限（sudo 安装后 ~/.npm 可能被 root 占用）
+fix_npm_cache_ownership() {
+    local npm_cache="$HOME/.npm"
+    if [ -d "$npm_cache" ]; then
+        local current_user
+        current_user=$(whoami 2>/dev/null || echo "")
+        if [ -n "$current_user" ] && [ "$current_user" != "root" ]; then
+            # 检查是否有 root 拥有的文件
+            if find "$npm_cache" -maxdepth 1 -user root 2>/dev/null | grep -q .; then
+                log_info "修复 npm 缓存目录权限..."
+                sudo chown -R "$current_user" "$npm_cache" 2>/dev/null || true
+            fi
+        fi
+    fi
+}
+
 # 显示菜单并获取选择
 show_menu() {
     local choice=""
@@ -541,6 +558,9 @@ install_openclaw() {
     log_info "开始安装 OpenClaw..."
     echo ""
 
+    # 修复 npm 缓存权限（防止之前 sudo 导致的 EACCES）
+    fix_npm_cache_ownership
+
     # 清除 npm 缓存确保获取最新版本
     log_info "清除 npm 缓存..."
     npm cache clean --force 2>/dev/null || true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclawsetup",
-  "version": "2.4.5",
+  "version": "2.4.7",
   "description": "OpenClaw 安装向导 - 智能安装、诊断、自动修复",
   "type": "module",
   "bin": {