diff --git a/.config b/.config index 624885f..aa061e7 100644 --- a/.config +++ b/.config @@ -21,6 +21,7 @@ CONFIG_PACKAGE_luci-ssl-openssl=y CONFIG_PACKAGE_luci-theme-argon=y CONFIG_PACKAGE_luci-app-adbyby-plus=y CONFIG_PACKAGE_luci-app-adguardhome=y +CONFIG_PACKAGE_luci-app-autoupdate=y CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-ddns=y CONFIG_PACKAGE_luci-app-frpc=y diff --git a/Customize/AutoUpdate.sh b/Customize/AutoUpdate.sh index 5de9620..569980f 100644 --- a/Customize/AutoUpdate.sh +++ b/Customize/AutoUpdate.sh @@ -3,7 +3,7 @@ # AutoBuild Module by Hyy2001 # AutoUpdate -Version=V3.4 +Version=V3.5 DEFAULT_DEVICE=d-team_newifi-d2 Github=https://github.com/Hyy2001X/AutoBuild-Actions @@ -41,7 +41,7 @@ if [ "$CURRENT_DEVICE" == "" ];then fi cd /tmp TIME && echo "正在获取云端固件版本..." -GET_Version=`wget -q $Github_Tags -O - | egrep -o 'R[0-9]+.[0-9]+.[0-9]+.[0-9]+' | awk 'NR==1'` +GET_Version=`wget -q $Github_Tags -O - | egrep -o 'R[0-9]+.[0-9]+.[0-9]+.[0-9]+' | awk 'END {print}' if [ "$GET_Version" == "" ];then TIME && echo "云端固件版本获取失败,请稍后重试!" exit diff --git a/README.md b/README.md index 6283cae..97892b4 100644 --- a/README.md +++ b/README.md @@ -11,14 +11,14 @@ Actions for Building OpenWRT 2. 复制获取到的Token值,**一定要保存到本地,Token值只会显示一次!** -3. `Fork`此仓库,然后进入到你的`AutoBuild-Actions`仓库 +3. `Fork`此仓库,然后进入你的`AutoBuild-Actions`仓库 4. 点击右上方菜单中的`Settings`,点击`Secrets`-`New Secrets`,`Name`项填写`RELEASE_TOKEN`,`Value`项填写你在第 1 步中获取到的Token 客制化固件: ------ -1. 进入到你的`AutoBuild-Actions`仓库 +1. 进入你的`AutoBuild-Actions`仓库 2. 编辑`/Customize/AutoUpdate.sh`文件,修改`第 7 行`为你要编译的设备名称,修改`第 8 行`为你的 Github 地址 @@ -32,3 +32,20 @@ Actions for Building OpenWRT ``` 5. **添加自定义文件:** 首先上传自定义文件到`/Customize`,然后编辑 `Diy-Part1()` 函数,参照参照现有 `mv2` 语法添加自定义文件到源码 + +自动编译&&升级固件: +------ + +1. 进入你的`AutoBuild-Actions`仓库 + +2. 编辑`/.github/workflows/AutoBuild.yml`文件,取消注释`第 21-22 行`,并按需修改 + +3. 打开Openwrt管理界面,点击`系统`-`定时更新`,设置自动升级的时间并保存(**需要 [luci-app-autoupdate](https://github.com/Hyy2001X/luci-app-autoupdate) 支持**) + +使用指令升级固件: +------ + +在终端输入: `bash /bin/AutoUpdate.sh` + +使用最新脚本升级: `curl -s https://raw.githubusercontent.com/Hyy2001X/Openwrt-AutoUpdate/master/AutoUpdate.sh | sh` + diff --git a/Scripts/diy-script.sh b/Scripts/diy-script.sh index c449708..0ac4a61 100644 --- a/Scripts/diy-script.sh +++ b/Scripts/diy-script.sh @@ -81,6 +81,7 @@ mv2 AutoUpdate.sh package/base-files/files/bin mv2 firewall.config package/network/config/firewall/files mv2 banner package/base-files/files/etc +ExtraPackages git luci-app-autoupdate https://github.com/Hyy2001X main ExtraPackages git luci-theme-argon https://github.com/jerrykuku 18.06 #ExtraPackages svn luci-theme-opentomato https://github.com/kenzok8/openwrt-packages/trunk #ExtraPackages svn luci-theme-opentomcat https://github.com/kenzok8/openwrt-packages/trunk