Merge pull request #203 from wukongdaily/dev

x86-64 24.10 新增 集成第三方插件功能(test)

.github/workflows/build-x86-64-24.10.2.yml

@@ -78,6 +78,7 @@ jobs:
               -v "${{ github.workspace }}/bin:/home/build/immortalwrt/bin" \
               -v "${{ github.workspace }}/files:/home/build/immortalwrt/files" \
               -v "${{ github.workspace }}/x86-64/imm.config:/home/build/immortalwrt/.config" \
+              -v "${{ github.workspace }}/shell/prepare-packages.sh:/home/build/immortalwrt/prepare-packages.sh" \
               -v "${{ github.workspace }}/x86-64/24.10/build.sh:/home/build/immortalwrt/build.sh" \
               -e PROFILE=$profile \
               -e INCLUDE_DOCKER=$include_docker \
@@ -114,5 +115,4 @@ jobs:
             ${{ github.workspace }}/*.sha256
           token: ${{ secrets.GITHUB_TOKEN }}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

shell/prepare-packages.sh

+#!/bin/sh
+
+BASE_DIR="extra-packages"
+TEMP_DIR="$BASE_DIR/temp-unpack"
+TARGET_DIR="packages"
+
+# 清理旧的目录
+rm -rf "$TEMP_DIR" "$TARGET_DIR"
+mkdir -p "$TEMP_DIR" "$TARGET_DIR"
+
+# 解压 .run 文件
+for run_file in "$BASE_DIR"/*.run; do
+    [ -e "$run_file" ] || continue
+    echo "🧩 解压 $run_file -> $TEMP_DIR"
+    sh "$run_file" --target "$TEMP_DIR" --noexec
+done
+
+# 1. 收集 run 解压出的 .ipk 文件
+find "$TEMP_DIR" -type f -name "*.ipk" -exec cp -v {} "$TARGET_DIR"/ \;
+
+# 2. 收集 extra-packages/*/ 下的 .ipk 文件（只查一级子目录）
+
+find "$BASE_DIR" -mindepth 2 -maxdepth 2 -type f -name "*.ipk" ! -path "$TEMP_DIR/*" \
+  -exec echo "👉 Found:" {} \; \
+  -exec cp -v {} "$TARGET_DIR"/ \;
+
+echo "✅ 所有 .ipk 文件已整理至 $TARGET_DIR/"
\ No newline at end of file

x86-64/24.10/build.sh

@@ -17,18 +17,31 @@ EOF
 
 echo "cat pppoe-settings"
 cat /home/build/immortalwrt/files/etc/config/pppoe-settings
-# 输出调试信息
-echo "$(date '+%Y-%m-%d %H:%M:%S') - 开始编译..."
 
+# ============= 同步第三方插件库==============
+# 下载 run 文件仓库
+echo "🔄 Cloning run file repo..."
+git clone --depth=1 https://github.com/wukongdaily/store.git /tmp/store-run-repo
+
+# 拷贝 run/x86 下所有 run 文件和ipk文件 到 extra-packages 目录
+mkdir -p /home/build/immortalwrt/extra-packages
+cp -r /tmp/store-run-repo/run/x86/* /home/build/immortalwrt/extra-packages/
+
+echo "✅ Run files copied to extra-packages:"
+ls -lh /home/build/immortalwrt/extra-packages/*.run
+# 解压并拷贝ipk到packages目录
+sh prepare-packages.sh
+ls -lah /home/build/immortalwrt/packages/
 
+# 输出调试信息
+echo "$(date '+%Y-%m-%d %H:%M:%S') - 开始构建固件..."
 
+# ============= imm仓库内的插件==============
 # 定义所需安装的包列表 下列插件你都可以自行删减
 PACKAGES=""
 PACKAGES="$PACKAGES curl"
 PACKAGES="$PACKAGES luci-i18n-diskman-zh-cn"
 PACKAGES="$PACKAGES luci-i18n-firewall-zh-cn"
-# 服务——FileBrowser 用户名admin 密码admin
-PACKAGES="$PACKAGES luci-i18n-filebrowser-go-zh-cn"
 PACKAGES="$PACKAGES luci-app-argon-config"
 PACKAGES="$PACKAGES luci-i18n-argon-config-zh-cn"
 #24.10
@@ -38,10 +51,35 @@ PACKAGES="$PACKAGES luci-i18n-passwall-zh-cn"
 PACKAGES="$PACKAGES luci-app-openclash"
 PACKAGES="$PACKAGES luci-i18n-homeproxy-zh-cn"
 PACKAGES="$PACKAGES openssh-sftp-server"
-# 增加几个必备组件 方便用户安装iStore
-PACKAGES="$PACKAGES fdisk"
-PACKAGES="$PACKAGES script-utils"
 PACKAGES="$PACKAGES luci-i18n-samba4-zh-cn"
+# 文件管理器
+PACKAGES="$PACKAGES luci-i18n-filemanager-zh-cn"
+# 静态文件服务器dufs(推荐)
+PACKAGES="$PACKAGES luci-i18n-dufs-zh-cn"
+
+# ============= imm仓库外的第三方插件==============
+
+# istore商店
+PACKAGES="$PACKAGES luci-app-store"
+# 首页和网络向导
+PACKAGES="$PACKAGES luci-i18n-quickstart-zh-cn"
+# 去广告adghome
+PACKAGES="$PACKAGES luci-app-adguardhome"
+# 代理相关
+PACKAGES="$PACKAGES luci-app-ssr-plus"
+PACKAGES="$PACKAGES luci-app-passwall2"
+PACKAGES="$PACKAGES luci-i18n-nikki-zh-cn"
+# VPN
+PACKAGES="$PACKAGES luci-app-tailscale"
+PACKAGES="$PACKAGES luci-i18n-tailscale-zh-cn"
+# 分区扩容 by sirpdboy 
+PACKAGES="$PACKAGES luci-app-partexp"
+PACKAGES="$PACKAGES luci-i18n-partexp-zh-cn"
+# 酷猫主题 by sirpdboy 
+PACKAGES="$PACKAGES luci-theme-kucat"
+# 网络测速 by sirpdboy 
+PACKAGES="$PACKAGES luci-app-netspeedtest"
+PACKAGES="$PACKAGES luci-i18n-netspeedtest-zh-cn"
 
 # 判断是否需要编译 Docker 插件
 if [ "$INCLUDE_DOCKER" = "yes" ]; then
@@ -60,4 +98,4 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-echo "$(date '+%Y-%m-%d %H:%M:%S') - Build completed successfully."
+echo "$(date '+%Y-%m-%d %H:%M:%S') - Build completed successfully."
\ No newline at end of file