From 52215028df2a97f535da29189491738408e6783b Mon Sep 17 00:00:00 2001
From: wukongdaily <2666180@gmail.com>
Date: Sun, 11 Jan 2026 16:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A3=80=E6=9F=A5=E5=B9=B6?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=20ssh-keygen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 generate_ssh_key.sh | 46 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/generate_ssh_key.sh b/generate_ssh_key.sh
index 4b3f62f..4ec1763 100644
--- a/generate_ssh_key.sh
+++ b/generate_ssh_key.sh
@@ -2,7 +2,8 @@
 set -e
 
 # ======================================================
-# OpenWrt 公钥生成脚本
+# OpenWrt SSH 公钥生成脚本
+# 自动检查并安装 ssh-keygen
 # ======================================================
 
 KEY_NAME="id_dropbear"
@@ -13,26 +14,57 @@ PRIV_KEY="$HIDDEN_DIR/$KEY_NAME"
 PUB_KEY="$HIDDEN_DIR/$KEY_NAME.pub"
 PUB_KEY_COPY="$PUBLIC_DIR/$KEY_NAME.pub"
 
+# ------------------------------------------------------
+# 检查 ssh-keygen 是否存在
+# ------------------------------------------------------
+if ! command -v ssh-keygen >/dev/null 2>&1; then
+  echo "⚠️ 未检测到 ssh-keygen，尝试安装 openssh-keygen ..."
+
+  # opkg 安装阶段不能让 set -e 直接中断
+  set +e
+  opkg update
+  opkg install openssh-keygen
+  RET=$?
+  set -e
+
+  if [ $RET -ne 0 ]; then
+    echo "❌ openssh-keygen 安装失败"
+    echo "请检查网络或软件源是否正常"
+    exit 1
+  fi
+
+  echo "✅ openssh-keygen 安装完成"
+fi
+
+# ------------------------------------------------------
 # 创建目录
+# ------------------------------------------------------
 mkdir -p "$HIDDEN_DIR"
 chmod 700 "$HIDDEN_DIR"
 
 mkdir -p "$PUBLIC_DIR"
 chmod 755 "$PUBLIC_DIR"
 
+# ------------------------------------------------------
 # 生成密钥
+# ------------------------------------------------------
 if [ ! -f "$PRIV_KEY" ]; then
-  echo "未发现 SSH 密钥，开始生成（ed25519）..."
+  echo "🔐 未发现 SSH 密钥，开始生成（ed25519）..."
   ssh-keygen -t ed25519 -f "$PRIV_KEY" -N ""
 else
-  echo "已存在 SSH 密钥，跳过生成"
-  echo "✅ SSH客户端私钥位于: $PRIV_KEY"
+  echo "ℹ️ 已存在 SSH 密钥，跳过生成"
+  echo "私钥路径: $PRIV_KEY"
 fi
 
+# ------------------------------------------------------
 # 复制公钥到普通目录，方便用户下载
+# ------------------------------------------------------
 cp -f "$PUB_KEY" "$PUB_KEY_COPY"
 chmod 644 "$PUB_KEY_COPY"
 
-echo "✅ 公钥生成完成"
-echo "隐藏目录: $PUB_KEY"
-echo "可下载副本: $PUB_KEY_COPY"
+# ------------------------------------------------------
+# 输出结果
+# ------------------------------------------------------
+echo "✅ SSH 公钥准备完成"
+echo "隐藏目录公钥: $PUB_KEY"
+echo "可下载公钥副本: $PUB_KEY_COPY"
\ No newline at end of file