kiddin9 4 anos atrás
pai
commit
201d21c2c7

+ 1 - 1
devices/common/default-settings

@@ -25,7 +25,7 @@ sed -i '/S99opkg/d' /etc/crontabs/root
 sec="$(grep -m1 -ao '[0-6][0-9]' /dev/urandom | head -n1)"
 echo "$sec 4 * * * sh /etc/rc.d/S99opkg >/dev/null 2>&1" >> /etc/crontabs/root
 
-test -n "$(/sbin/cpuinfo 2>/dev/null)" || sed -i "s/_('CPU Info'),cpuinfo.cpufreq,//" /www/luci-static/resources/view/status/include/10_system.js
+[[ "$(echo "$(/sbin/cpuinfo 2>/dev/null)" | grep -i "MHz")" ]] || sed -i "s/_('CPU Info'),cpuinfo.cpufreq,//" /www/luci-static/resources/view/status/include/10_system.js
 
 grep -q op.supes.top /etc/bypass/white.list ||
 		echo "op.supes.top" >> /etc/bypass/white.list

+ 1 - 1
devices/common/diy.sh

@@ -28,7 +28,7 @@ sed -i 's/max_requests 3/max_requests 20/g' package/network/services/uhttpd/file
 #rm -rf ./feeds/packages/lang/{golang,node}
 #svn export https://github.com/immortalwrt/packages/trunk/lang/golang feeds/packages/lang/golang
 #svn export https://github.com/immortalwrt/packages/trunk/lang/node feeds/packages/lang/node
-curl https://git.io/J0klM --create-dirs -o package/network/config/firewall/patches/fullconenat.patch
+curl -L https://git.io/J0klM --create-dirs -o package/network/config/firewall/patches/fullconenat.patch
 sed -i -e 's/+python\( \|$\)/+python3/g' -e 's?../../lang?$(TOPDIR)/feeds/packages/lang?g' package/feeds/custom/*/Makefile
 sed -i 's?admin/status/channel_analysis??' package/feeds/luci/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json
 sed -i "s/askfirst/respawn/g" `find package target -name inittab`

+ 3 - 3
devices/nanopi-r2s/diy.sh

@@ -9,11 +9,11 @@ svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/
 rm -rf target/linux/rockchip/{.svn,patches-5.4/.svn}
 svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/linux/rockchip/patches-5.4 target/linux/rockchip/patches-5.4
 
-curl https://git.io/J0klE -o package/kernel/linux/modules/video.mk
+curl -L https://git.io/J0klE -o package/kernel/linux/modules/video.mk
 
 mkdir -p files/etc/rc.d
-curl https://git.io/J0kc3 --create-dirs -o files/usr/bin/start-rk3328-pwm-fan.sh
-curl https://git.io/J0kW8 --create-dirs -o files/etc/init.d/fa-rk3328-pwmfan
+curl -L https://git.io/J0kc3 --create-dirs -o files/usr/bin/start-rk3328-pwm-fan.sh
+curl -L https://git.io/J0kW8 --create-dirs -o files/etc/init.d/fa-rk3328-pwmfan
 chmod +x files/usr/bin/start-rk3328-pwm-fan.sh files/etc/init.d/fa-rk3328-pwmfan
 ln -sf /etc/init.d/fa-rk3328-pwmfan files/etc/rc.d/S96fa-rk3328-pwmfan
 

+ 3 - 3
devices/nanopi-r4s/diy.sh

@@ -9,11 +9,11 @@ svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/
 rm -rf target/linux/rockchip/{.svn,patches-5.4/.svn}
 svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/linux/rockchip/patches-5.4 target/linux/rockchip/patches-5.4
 
-curl https://git.io/J0klE -o package/kernel/linux/modules/video.mk
+curl -L https://git.io/J0klE -o package/kernel/linux/modules/video.mk
 
 mkdir -p files/etc/rc.d
-curl https://git.io/J0kRv --create-dirs -o files/usr/bin/start-rk3399-pwm-fan.sh
-curl https://git.io/J0kRG --create-dirs -o files/etc/init.d/fa-rk3399-pwmfan
+curl -L https://git.io/J0kRv --create-dirs -o files/usr/bin/start-rk3399-pwm-fan.sh
+curl -L https://git.io/J0kRG --create-dirs -o files/etc/init.d/fa-rk3399-pwmfan
 chmod +x files/usr/bin/start-rk3399-pwm-fan.sh files/etc/init.d/fa-rk3399-pwmfan
 ln -sf /etc/init.d/fa-rk3399-pwmfan files/etc/rc.d/S96fa-rk3399-pwmfan