From c9b68b65cf874a71831736a3facb6db29068cddc Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Mon, 4 Oct 2021 23:10:45 +0800 Subject: [PATCH] int --- diy/18.06.sh | 86 ---------------------------------------- diy/banner | 2 +- diy/customize.sh | 22 +++------- diy/default-settings | 13 ++---- diy/zzz-default-settings | 14 ++----- 5 files changed, 12 insertions(+), 125 deletions(-) delete mode 100755 diy/18.06.sh diff --git a/diy/18.06.sh b/diy/18.06.sh deleted file mode 100755 index 04719b6ef..000000000 --- a/diy/18.06.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -git clone https://github.com/garypang13/luci-app-dnsfilter -git clone -b 18.06 https://github.com/garypang13/luci-theme-edge -git clone https://github.com/tty228/luci-app-serverchan -git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon -git clone https://github.com/jerrykuku/luci-app-argon-config -git clone https://github.com/jerrykuku/luci-app-vssr -git clone https://github.com/jerrykuku/luci-app-jd-dailybonus -git clone https://github.com/zzsj0928/luci-app-pushbot -git clone https://github.com/BCYDTZ/luci-app-UUGameAcc -git clone https://github.com/garypang13/luci-app-eqos -git clone https://github.com/BoringCat/luci-app-mentohust -git clone https://github.com/small-5/luci-app-xlnetacc -git clone https://github.com/project-lede/luci-app-godproxy -git clone https://github.com/sirpdboy/luci-app-advanced -git clone https://github.com/ntlf9t/luci-app-easymesh -git clone https://github.com/walkingsky/luci-wifidog luci-app-wifidog -git clone https://github.com/linkease/ddnsto-openwrt -svn co https://github.com/messense/aliyundrive-webdav/trunk/openwrt/aliyundrive-webdav -svn co https://github.com/messense/aliyundrive-webdav/trunk/openwrt/luci-app-aliyundrive-webdav -svn co https://github.com/garypang13/openwrt-bypass/trunk/luci-app-bypass -svn co https://github.com/garypang13/openwrt-bypass/trunk/lua-maxminddb -svn co https://github.com/garypang13/openwrt-bypass/trunk/smartdns-le -svn co https://github.com/garypang13/openwrt-packages/trunk/gost -svn co https://github.com/kenzok8/my-packages/trunk/luci-app-gpsysupgrade -svn co https://github.com/vernesong/OpenClash/trunk/luci-app-openclash -svn co https://github.com/frainzy1477/luci-app-clash/trunk ./luci-app-clash -svn co https://github.com/Tencent-Cloud-Plugins/tencentcloud-openwrt-plugin-ddns/trunk/tencentcloud_ddns luci-app-tencentddns -svn co https://github.com/fw876/helloworld/trunk/luci-app-ssr-plus -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/luci-app-passwall -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/naiveproxy -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/dns2socks -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/hysteria -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/ipt2socks -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/kcptun -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/pdnsd-alt -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/shadowsocks-rust -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/shadowsocksr-libev -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/simple-obfs -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/ssocks -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/brook -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/chinadns-ng -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/simple-obfs -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/tcping -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/trojan-go -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/trojan-plus -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/trojan -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/v2ray-core -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/v2ray-plugin -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/xray-core -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/xray-plugin -svn co https://github.com/sirpdboy/sirpdboy-package/trunk/luci-app-koolddns -svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/microsocks -svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/redsocks2 -svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/tcpping -svn co https://github.com/liuran001/openwrt-theme/trunk/luci-theme-argon-lr -svn co https://github.com/openwrt/packages/trunk/net/shadowsocks-libev -svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-aliddns -svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-udp2raw -svn co https://github.com/immortalwrt/packages/trunk/net/udp2raw-tunnel -svn co https://github.com/kenzok8/jell/trunk/luci-app-adguardhome -svn co https://github.com/kenzok8/jell/trunk/adguardhome -svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-smartdns -svn co https://github.com/immortalwrt/packages/trunk/net/smartdns -svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-gost -svn co https://github.com/kenzok8/litte/trunk/luci-theme-argon_new -svn co https://github.com/kenzok8/litte/trunk/luci-theme-opentopd_new -svn co https://github.com/kenzok8/litte/trunk/luci-theme-atmaterial_new -svn co https://github.com/kenzok8/litte/trunk/luci-theme-mcat -svn co https://github.com/kenzok8/litte/trunk/luci-theme-tomato - -svn co https://github.com/immortalwrt/packages/trunk/admin/bpytop -svn co https://github.com/immortalwrt/packages/trunk/libs/jpcre2 -svn co https://github.com/immortalwrt/packages/trunk/libs/wxbase -svn co https://github.com/immortalwrt/packages/trunk/libs/libcron -svn co https://github.com/immortalwrt/packages/trunk/libs/rapidjson -svn co https://github.com/immortalwrt/packages/trunk/libs/quickjspp -svn co https://github.com/immortalwrt/packages/trunk/libs/toml11 -svn co https://github.com/garypang13/openwrt-packages/trunk/qtbase -svn co https://github.com/garypang13/openwrt-packages/trunk/qttools -svn co https://github.com/garypang13/openwrt-packages/trunk/rblibtorrent - - -rm -rf ./*/.git & rm -f ./*/.gitattributes -rm -rf ./*/.svn & rm -rf ./*/.github & rm -rf ./*/.gitignore -exit 0 diff --git a/diy/banner b/diy/banner index 1d4159cfd..5bc33d593 100755 --- a/diy/banner +++ b/diy/banner @@ -4,5 +4,5 @@ \___/ .__/\__/_//_/__,__/_/ \__/ /_/ -------------------------------- - %D %V, %C + %D %V, by kenzo -------------------------------- diff --git a/diy/customize.sh b/diy/customize.sh index 0950032bd..be3cf732b 100755 --- a/diy/customize.sh +++ b/diy/customize.sh @@ -7,23 +7,11 @@ sed -i 's/192.168.1.1/192.168.3.1/g' openwrt/package/base-files/files/bin/config date=`date +%m.%d` date1=`date +%h` -sed -i "s/DISTRIB_DESCRIPTION=\"0penwrt'\"/g" package/base-files/files/etc/openwrt_release -sed -i "s/DISTRIB_REVISION=\"$date'\"/g" package/base-files/files/etc/openwrt_release -sed -i "s/%C=\"$date1'\"/g" package/base-files/files/etc/openwrt_version -sed -i "s/ %D %V, %C=\"v_$date1 by kenzo'\"/g" package/base-files/files/etc/banner -#Lean设置 -sed -i "s/LuCI Master=\"kenzo'\"/g" package/lean/default-settings/files/zzz-default-settings -sed -i "s/luciversion=\"$date1'\"/g" package/lean/default-settings/files/zzz-default-settings -#ctc设置 -sed -i "s/LuCI openwrt-18.06 branch=\"kenzo'\"/g" package/emortal/default-settings/files/zzz-default-settings -sed -i "s/LuCI openwrt-21.02 branch=\"kenzo'\"/g" package/emortal/default-settings/files/zzz-default-settings -sed -i "s/luciversion=\"$date1'\"/g" package/emortal/default-settings/files/zzz-default-settings -#Lienol设置 -sed -i "s/17.01 Lienol=\"kenzo'\"/g" package/default-settings/files/zzz-default-settings -sed -i "s/luciversion=\"$date1'\"/g" package/default-settings/files/zzz-default-settings - -# 修改自定义固件名,增加编译日期(by:kenzo） -sed -i "s/IMG_PREFIX:=$(VERSION_DIST_SANITIZED)=\"IMG_PREFIX:=$date-$(VERSION_DIST_SANITIZED)'\"/g" include/image.mk +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/diy/default-settings b/diy/default-settings index 67302f8bb..379a0a3dc 100755 --- a/diy/default-settings +++ b/diy/default-settings @@ -45,19 +45,12 @@ echo '[ -n "$(command -v ip6tables)" ] && ip6tables -t nat -A PREROUTING -p tcp sed -i '/option disabled/d' /etc/config/wireless sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh -uci set network.lan.ipaddr='192.168.1.252' # ĬIPַ -uci set network.lan.proto='static' # ̬IP -uci set network.lan.type='bridge' # ӿ:Ž -uci set network.lan.ifname='eth0' # ˿ڣĬ eth0һ -uci set network.lan.netmask='255.255.255.0' # -uci set network.lan.gateway='192.168.1.251' # Ĭصַ·IP -uci set network.lan.dns='192.168.1.251 223.5.5.5 119.29.29.29' # Ĭ DNS ַ -uci commit network - date=`date +%m.%d` date1=`date +%h` sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release echo "DISTRIB_REVISION='v$date'" >> /etc/openwrt_release +sed -i '/DISTRIB_RELEASE/d' /etc/openwrt_release +echo "DISTRIB_RELEASE='v$date1'" >> /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release echo "DISTRIB_DESCRIPTION='Openwrt '" >> /etc/openwrt_release @@ -66,7 +59,7 @@ sed -i 's/LuCI openwrt-18.06 branch/kenzo/g' /usr/lib/lua/luci/version.lua sed -i 's/LuCI 17.01 Lienol/kenzo/g' /usr/lib/lua/luci/version.lua sed -i 's/LuCI openwrt-21.02 branch/kenzo/g' /usr/lib/lua/luci/version.lua sed -i '/luciversion/d' /usr/lib/lua/luci/version.lua -echo 'luciversion = "$date1"' >> /usr/lib/lua/luci/version.lua +echo 'luciversion = "Otc"' >> /usr/lib/lua/luci/version.lua sed -i '/log-facility/d' /etc/dnsmasq.conf echo "log-facility=/dev/null" >> /etc/dnsmasq.conf diff --git a/diy/zzz-default-settings b/diy/zzz-default-settings index 4c2dbbd8d..787441118 100755 --- a/diy/zzz-default-settings +++ b/diy/zzz-default-settings @@ -31,16 +31,6 @@ sed -i "s/# //g" /etc/opkg/distfeeds.conf #uci set dhcp.@dnsmasq[0].nonwildcard=0 #uci commit dhcp -#IP -uci set network.lan.ipaddr='192.168.1.252' # ĬIPַ -uci set network.lan.proto='static' # ̬IP -uci set network.lan.type='bridge' # ӿ:Ž -uci set network.lan.ifname='eth0' # ˿ڣĬ eth0һ -uci set network.lan.netmask='255.255.255.0' # -uci set network.lan.gateway='192.168.1.251' # Ĭصַ·IP -uci set network.lan.dns='192.168.1.251 223.5.5.5 119.29.29.29' # Ĭ DNS ַ -uci commit network - #DNSض sed -i '/REDIRECT --to-ports 53/d' /etc/firewall.user echo "# iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53" >> /etc/firewall.user @@ -53,6 +43,8 @@ date=`date +%m.%d` date1=`date +%h` sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release echo "DISTRIB_REVISION='v$date'" >> /etc/openwrt_release +sed -i '/DISTRIB_RELEASE/d' /etc/openwrt_release +echo "DISTRIB_RELEASE='v$date1'" >> /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release echo "DISTRIB_DESCRIPTION='Openwrt '" >> /etc/openwrt_release @@ -61,7 +53,7 @@ sed -i 's/LuCI openwrt-18.06 branch/kenzo/g' /usr/lib/lua/luci/version.lua sed -i 's/LuCI 17.01 Lienol/kenzo/g' /usr/lib/lua/luci/version.lua sed -i 's/LuCI openwrt-21.02 branch/kenzo/g' /usr/lib/lua/luci/version.lua sed -i '/luciversion/d' /usr/lib/lua/luci/version.lua -echo 'luciversion = "$date1"' >> /usr/lib/lua/luci/version.lua +echo 'luciversion = "Otc"' >> /usr/lib/lua/luci/version.lua # ɾ״̬ҳʾ rm -rf /usr/lib/lua/luci/view/admin_status/index