diff --git a/.github/diy/customize.sh b/.github/diy/customize.sh deleted file mode 100755 index be3cf732b..000000000 --- a/.github/diy/customize.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# -------------------------------------------------------- -# Script to compile and create files for each openwrt -# -------------------------------------------------------- -#1. Modify default IP -sed -i 's/192.168.1.1/192.168.3.1/g' openwrt/package/base-files/files/bin/config_generate - -date=`date +%m.%d` -date1=`date +%h` -sed -i "s/DISTRIB_DESCRIPTION.*/DISTRIB_DESCRIPTION=\'Openwrt\'/g" package/base-files/files/etc/openwrt_release -sed -i "s/DISTRIB_REVISION.*/DISTRIB_REVISION=\'$date\'/g" package/base-files/files/etc/openwrt_release -sed -i "s/DISTRIB_RELEASE.*/DISTRIB_RELEASE=\'$date1\'/g" package/base-files/files/etc/openwrt_release - -#2. 修改自定义固件名,增加编译日期(by:kenzo) -sed -i "s/IMG_PREFIX:=$(VERSION_DIST_SANITIZED)=\"IMG_PREFIX:=$(shell date +%m-%d)-$(VERSION_DIST_SANITIZED)'\"/g" include/image.mk - -exit diff --git a/.github/diy/main.sh b/.github/diy/main.sh index 1b6ee7212..becaf94a1 100755 --- a/.github/diy/main.sh +++ b/.github/diy/main.sh @@ -128,8 +128,8 @@ git clone --depth 1 https://github.com/xiaorouji/openwrt-passwall passwall1 && m git clone --depth 1 https://github.com/SSSSSimon/tencentcloud-openwrt-plugin-ddns && mv -n tencentcloud-openwrt-plugin-ddns/tencentcloud_ddns ./luci-app-tencentddns; rm -rf tencentcloud-openwrt-plugin-ddns git clone --depth 1 https://github.com/Tencent-Cloud-Plugins/tencentcloud-openwrt-plugin-cos && mv -n tencentcloud-openwrt-plugin-cos/tencentcloud_cos ./luci-app-tencentcloud-cos; rm -rf tencentcloud-openwrt-plugin-cos git clone --depth 1 https://github.com/kiddin9/openwrt-packages && mv -n openwrt-packages/luci-app-bypass openwrt-packages/luci-app-fileassistant ./ ; rm -rf openwrt-packages -git clone --depth 1 https://github.com/immortalwrt/packages && mv -n packages/net/{cdnspeedtest,daed} ./ ; rm -rf packages -git clone --depth 1 https://github.com/immortalwrt/luci && mv -n luci/applications/{luci-app-daed,luci-app-filebrowser,luci-app-gost,luci-app-homeproxy} ./ ; rm -rf luci +git clone --depth 1 https://github.com/immortalwrt/packages && mv -n packages/net/{cdnspeedtest,dae,daed,vsftpd,transmission} ./ ; rm -rf packages +git clone --depth 1 https://github.com/immortalwrt/luci && mv -n luci/applications/{luci-app-daed,luci-app-filebrowser,luci-app-gost,luci-app-homeproxy,luci-app-transmission} ./ ; rm -rf luci git clone --depth 1 https://github.com/mingxiaoyu/luci-app-cloudflarespeedtest cloudflarespeedtest && mv -n cloudflarespeedtest/applications/* ./;rm -rf cloudflarespeedtest git clone --depth 1 https://github.com/doushang/luci-app-shortcutmenu luci-shortcutmenu && mv -n luci-shortcutmenu/luci-app-shortcutmenu ./ ; rm -rf luci-shortcutmenu git clone --depth 1 https://github.com/sbilly/netmaker-openwrt && mv -n netmaker-openwrt/netmaker ./; rm -rf netmaker-openwrt @@ -209,6 +209,7 @@ sed -i 's/+libcap /+libcap +libcap-bin /' luci-app-openclash/Makefile sed -i 's/\(+luci-compat\)/\1 +luci-theme-argon/' luci-app-argon-config/Makefile sed -i 's/\(+luci-compat\)/\1 +luci-theme-design/' luci-app-design-config/Makefile sed -i 's/\(+luci-compat\)/\1 +luci-theme-argone/' luci-app-argone-config/Makefile +sed -i 's/+vsftpd-alt$/+vsftpd/' luci-app-tencentcloud-cos/Makefile sed -i 's/ +uhttpd-mod-ubus//' luci-app-packet-capture/Makefile sed -i 's/ ip.neighbors/ luci.ip.neighbors/' luci-app-wifidog/luasrc/model/cbi/wifidog/wifidog_cfg.lua #sed -i -e 's/nas/services/g' -e 's/NAS/Services/g' $(grep -rl 'nas\|NAS' luci-app-fileassistant) diff --git a/README.md b/README.md index 8574b97a2..45950d082 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ 对于强迫症的同学(有报错信息、或Lean源码编译出错的情况),请尝试删除冲突的插件 ```bash -rm -rf feeds/smpackage/{base-files,dnsmasq,firewall*,fullconenat,libnftnl,nftables,ppp,opkg,ucl,upx,vsftpd-alt,miniupnpd-iptables,wireless-regdb} +rm -rf feeds/smpackage/{base-files,dnsmasq,firewall*,fullconenat,libnftnl,nftables,ppp,opkg,ucl,upx,vsftpd*,miniupnpd-iptables,wireless-regdb} ```