Update start-openclaw.sh

start-openclaw.sh

@@ -1,14 +1,11 @@
 #!/bin/bash
 set -euo pipefail
-echo "===== OpenClaw 启动脚本 v2.2 (修正版) ====="
+echo "===== OpenClaw 启动脚本 v2.3 (简化版) ====="
 echo "启动时间: $(date)"
 
 echo ""
 echo "=== 1. 初始化环境与目录 ==="
-mkdir -p /root/.openclaw/agents/main/sessions
-mkdir -p /root/.openclaw/credentials
-mkdir -p /root/.openclaw/sessions
-mkdir -p /root/.openclaw/skills
+mkdir -p /root/.openclaw/{agents/main/sessions,credentials,sessions,skills}
 echo "目录结构创建完成。"
 
 echo ""
@@ -16,68 +13,50 @@ echo "=== 2. 从备份恢复数据 ==="
 if python3 /app/sync.py restore; then
     echo "✓ 数据恢复完成。"
 else
-    echo "⚠️  数据恢复过程可能存在问题，将继续启动流程。" >&2
+    echo "⚠️  数据恢复失败，继续启动。" >&2
 fi
 
 echo ""
 echo "=== 3. 检查与安装技能 ==="
-SKILLS=("openclaw-tavily-search" "openclaw-setup-service" "openclaw-weixin")
+SKILLS=("openclaw-tavily-search")
 INSTALLED_SKILLS=()
 
 for skill in "${SKILLS[@]}"; do
-    echo ""
-    echo "检查技能: $skill"
+    echo "处理技能: $skill"
     is_installed=false
-
-    if command -v clawhub &> /dev/null && clawhub list 2>/dev/null | grep -q "$skill"; then
-        echo "  ✓ 已通过 clawhub 安装。"
+    
+    # 检查是否已安装
+    if clawhub list 2>/dev/null | grep -q "$skill"; then
+        echo "  ✓ 已安装"
         is_installed=true
+    # 检查是否已存在目录
     elif [ -d "/app/skills/$skill" ] || [ -d "/root/.openclaw/skills/$skill" ]; then
-        echo "  ✓ 技能目录已存在。"
+        echo "  ✓ 目录已存在"
         is_installed=true
+    # 尝试安装
     else
-        echo "  ✗ 未找到技能，尝试通过 clawhub 安装..."
-        if command -v clawhub &> /dev/null && clawhub install "$skill"; then
-            echo "  ✓ 安装成功: $skill"
+        echo "  🔧 尝试安装..."
+        if clawhub install "$skill"; then
+            echo "  ✓ 安装成功"
             is_installed=true
         else
-            echo "  ⚠️  安装失败: $skill (clawhub 可能不可用或网络错误)。" >&2
+            echo "  ⚠️  安装失败" >&2
         fi
     fi
-
-    if [ "$is_installed" = true ]; then
-        INSTALLED_SKILLS+=("$skill")
-    fi
+    
+    [ "$is_installed" = true ] && INSTALLED_SKILLS+=("$skill")
 done
 
-
 echo ""
-echo "=== 5. 技能结构诊断 ==="
-for skill in "${INSTALLED_SKILLS[@]}"; do
-    echo ""
-    echo "--- 诊断技能: $skill ---"
-    possible_paths=("/app/skills/$skill" "/root/.openclaw/skills/$skill" "/skills/$skill")
-    for dir in "${possible_paths[@]}"; do
-        if [ -d "$dir" ]; then
-            echo "  找到目录: $dir"
-            for meta_file in "skill.json" "package.json" "_meta.json"; do
-                if [ -f "$dir/$meta_file" ]; then
-                    echo "    📄 发现 $meta_file"
-                fi
-            done
-            break
-        fi
-    done
-done
-
-echo ""
-echo "=== 6. 配置 API 地址与生成主配置 ==="
+echo "=== 4. 配置 API 地址与生成主配置 ==="
+# 清理 API 地址
 CLEAN_BASE="${OPENAI_API_BASE%/}"
 CLEAN_BASE="${CLEAN_BASE%/chat/completions}"
 CLEAN_BASE="${CLEAN_BASE%/v1}"
 CLEAN_BASE="${CLEAN_BASE}/v1"
-echo "规范化后的 API 地址: $CLEAN_BASE"
+echo "API 地址: $CLEAN_BASE"
 
+# 生成主配置
 cat > /root/.openclaw/openclaw.json <<EOF
 {
   "models": {
@@ -110,9 +89,7 @@ cat > /root/.openclaw/openclaw.json <<EOF
       "token": "$OPENCLAW_GATEWAY_PASSWORD" 
     },
     "controlUi": { 
-      "allowedOrigins": [
-        "*",
-      ],
+      "allowedOrigins": ["*"],
       "dangerouslyAllowHostHeaderOriginFallback": true,
       "allowInsecureAuth": true,
       "dangerouslyDisableDeviceAuth": true
@@ -125,80 +102,59 @@ cat > /root/.openclaw/openclaw.json <<EOF
         "enabled": true
       }
     }
-  },
- 
+  }
 }
 EOF
-echo "主配置文件已生成: /root/.openclaw/openclaw.json"
+echo "配置生成完成"
 
 echo ""
-echo "=== 7. 设置权限与技能链接 ==="
+echo "=== 5. 设置权限与技能链接 ==="
 chmod 700 /root/.openclaw
 chmod 600 /root/.openclaw/openclaw.json
 chmod 700 /root/.openclaw/{agents,credentials,sessions}
 chmod 750 /root/.openclaw/skills
 
+# 创建技能链接
 for skill in "${INSTALLED_SKILLS[@]}"; do
-    echo "处理技能链接: $skill"
-    source_dir=""
     for dir in "/app/skills/$skill" "/skills/$skill" "/root/.openclaw/skills/$skill"; do
         if [ -d "$dir" ]; then
-            source_dir="$dir"
+            ln -sfn "$dir" "/root/.openclaw/skills/$(basename "$skill")"
+            echo "✓ 链接创建: $skill"
             break
         fi
     done
-
-    if [ -n "$source_dir" ]; then
-        link_target="/root/.openclaw/skills/$(basename "$skill")"
-        if [ ! -L "$link_target" ] || [ "$(readlink -f "$link_target")" != "$(readlink -f "$source_dir")" ]; then
-            ln -sfn "$source_dir" "$link_target"
-            echo "  ✓ 链接已创建/更新: $link_target -> $source_dir"
-        fi
-    else
-        echo "  ⚠️  未找到技能目录，无法创建链接: $skill" >&2
-    fi
 done
 
 echo ""
-echo "=== 8. 运行启动前检查 ==="
-if command -v openclaw &> /dev/null; then
+echo "=== 6. 运行启动前检查 ==="
+if command -v openclaw &>/dev/null; then
     openclaw doctor --fix 2>&1 | tee /tmp/openclaw-doctor-startup.log
-    echo "健康检查日志: /tmp/openclaw-doctor-startup.log"
-    echo ""
-    echo "--- 已安装技能列表 (openclaw) ---"
-    openclaw skills list 2>&1 || echo "  无法列出技能。"
+    echo "--- 已安装技能列表 ---"
+    openclaw skills list 2>&1 || true
 else
-    echo "⚠️  openclaw 命令未找到，跳过健康检查。" >&2
+    echo "⚠️  openclaw 命令未找到" >&2
 fi
 
 echo ""
-echo "=== 9. 环境摘要 ==="
-echo "服务端口: $PORT"
-echo "模型: $MODEL"
-echo "API 地址: ${CLEAN_BASE%/v1} (v1)"
-echo "网关令牌: ${OPENCLAW_GATEWAY_PASSWORD:0:3}..."
-echo "Tavily Key: ${TAVILY_API_KEY:0:5}..."
+echo "=== 7. 环境摘要 ==="
+echo "端口: $PORT | 模型: $MODEL"
+echo "API: ${CLEAN_BASE%/v1} (v1)"
+echo "令牌: ${OPENCLAW_GATEWAY_PASSWORD:0:3}***"
+echo "Tavily: ${TAVILY_API_KEY:0:5}***"
 
 echo ""
-echo "=== 10. 启动后台任务与主服务 ==="
+echo "=== 8. 启动后台任务与主服务 ==="
+# 定时备份任务
 (
-    echo "  定时备份任务启动。"
     while true; do
         sleep 3600
-        if python3 /app/sync.py backup; then
-            echo "  [$(date)] 定时备份完成。"
-        else
-            echo "  [$(date)] 定时备份失败。" >&2
-        fi
+        python3 /app/sync.py backup && echo "[$(date)] 备份完成" || echo "[$(date)] 备份失败" >&2
     done
 ) &
-BACKUP_PID=$!
-echo "  定时备份任务 PID: $BACKUP_PID"
 
 echo ""
 echo "======================================"
-echo "正在启动 OpenClaw 网关..."
-echo "控制台 (如配置): "
+echo "启动 OpenClaw 网关..."
 echo "======================================"
 echo ""
 exec openclaw gateway run --port "$PORT"