From 79d95b24194c3c891ac2df19d5854b2a1cabc163 Mon Sep 17 00:00:00 2001
From: 3344 <xzx3344521@gmail.com>
Date: Thu, 22 Jan 2026 16:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20ru2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ru2 | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/ru2 b/ru2
index 819da41..b4cc178 100644
--- a/ru2
+++ b/ru2
@@ -1,4 +1,4 @@
-cat > install_native.sh << 'EOF'
+cat > install_native_fix.sh << 'EOF'
 #!/bin/bash
 # 颜色定义
 GREEN='\033[32m'
@@ -15,7 +15,7 @@ fi
 echo -e "${GREEN}正在安装必要工具...${PLAIN}"
 apt-get update -y && apt-get install -y wget unzip tar systemd
 
-# 2. 设置目录 (适配你的习惯)
+# 2. 设置目录
 INSTALL_DIR="/opt/rustdesk"
 # 数据存放目录 (你的习惯路径)
 DATA_DIR="/vol1/1000/dock/rustdesk_native"
@@ -30,10 +30,12 @@ if [[ -z "$HOST_IP" ]]; then
     exit 1
 fi
 
-# 4. 下载并解压程序 (使用 1.1.11-1 稳定版)
+# 4. 下载并解压程序
 echo -e "${YELLOW}正在下载 RustDesk 服务端程序...${PLAIN}"
 cd "$INSTALL_DIR"
-rm -rf rustdesk-server-linux-amd64.zip hbbs hbbr
+# 清理旧文件
+rm -rf rustdesk-server.zip hbbs hbbr amd64
+
 wget -O rustdesk-server.zip https://github.com/rustdesk/rustdesk-server/releases/download/1.1.11-1/rustdesk-server-linux-amd64.zip
 
 if [ ! -f "rustdesk-server.zip" ]; then
@@ -41,9 +43,24 @@ if [ ! -f "rustdesk-server.zip" ]; then
     exit 1
 fi
 
+echo -e "${YELLOW}正在解压并整理文件...${PLAIN}"
 unzip -o rustdesk-server.zip
+
+# === 关键修正：把文件从 amd64 文件夹里移动出来 ===
+if [ -d "amd64" ]; then
+    mv amd64/hbbs .
+    mv amd64/hbbr .
+    rm -rf amd64
+fi
+# ============================================
+
 chmod +x hbbs hbbr
 
+if [ ! -f "hbbs" ]; then
+    echo -e "${RED}错误：解压后未找到 hbbs 文件，安装终止。${PLAIN}"
+    exit 1
+fi
+
 # 5. 创建系统服务 (hbbs - ID服务器)
 echo -e "${YELLOW}正在注册系统服务...${PLAIN}"
 
@@ -117,6 +134,6 @@ else
 fi
 EOF
 
-# 运行刚才生成的脚本
-chmod +x install_native.sh
-./install_native.sh
\ No newline at end of file
+# 运行脚本
+chmod +x install_native_fix.sh
+./install_native_fix.sh
\ No newline at end of file