fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Mainline

Browse Source
This commit is contained in:
CN_SZTL 2020-07-28 16:09:13 +08:00
commit 61eae149de
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package/ctcgfw/luci-app-oled/root/etc/init.d/oled
View File

@ -9,9 +9,8 @@ start() {
exit 0
fi
#crontab daemon
cat /etc/crontabs/root | grep oled > /dev/null
if [ $? -eq 1 ]; then
echo "*/5 * * * * /etc/init.d/oled restart &>/dev/null 2>&1" >> /etc/crontabs/root
if ! grep "/etc/init.d/oled \+restart" /etc/crontabs/root >/dev/null 2>&1; then
echo "*/5 * * * * /etc/init.d/oled restart >/dev/null 2>&1" >> /etc/crontabs/root
fi
date=$(uci get oled.@oled[0].date)
@ -37,7 +36,7 @@ start() {
if [ ${netspeed} -eq 1 ]; then
nohup /usr/sbin/netspeed ${netsource} >/dev/null 2>&1 &
else
ps|grep netspeed|grep -v grep|awk '{print $1}'|xargs kill -9
kill -9 $(pgrep -f /usr/sbin/netspeed)
rm -f /tmp/netspeed
fi
nohup ${PROG} ${date} ${lanip} ${cputemp} ${cpufreq} ${netspeed} ${time} ${drawline} ${drawrect} ${fillrect} ${drawcircle} ${drawroundrect} ${fillroundrect} ${drawtriangle} ${filltriangle} ${displaybitmap} ${displayinvertnormal} ${drawbitmapeg} ${scroll} "${text}" "${netsource}" 1 > /dev/null 2>&1 &
@ -45,8 +44,8 @@ start() {
stop() {
kill -2 `pgrep /usr/bin/oled`
ps|grep netspeed|grep -v grep|awk '{print $1}'|xargs kill -9
kill -9 $(pgrep /usr/bin/oled)
kill -9 $(pgrep -f /usr/sbin/netspeed)
echo "oled exit..."
}
@ -55,8 +54,8 @@ restart(){
pgrep -f ${PROG} >/dev/null
if [ $? -eq 0 ]; then
if [ $enabled -eq 1 ]; then
kill `pgrep /usr/bin/oled`
ps|grep netspeed|grep -v grep|awk '{print $1}'|xargs kill -9
kill -9 $(pgrep /usr/bin/oled)
kill -9 $(pgrep -f /usr/sbin/netspeed)
date=$(uci get oled.@oled[0].date)
lanip=$(uci get oled.@oled[0].lanip)
@ -81,7 +80,7 @@ restart(){
if [ ${netspeed} -eq 1 ]; then
nohup /usr/sbin/netspeed ${netsource} >/dev/null 2>&1 &
else
ps|grep netspeed|grep -v grep|awk '{print $1}'|xargs kill -9
kill -9 $(pgrep -f /usr/sbin/netspeed)
rm -f /tmp/netspeed
fi
nohup ${PROG} ${date} ${lanip} ${cputemp} ${cpufreq} ${netspeed} ${time} ${drawline} ${drawrect} ${fillrect} ${drawcircle} ${drawroundrect} ${fillroundrect} ${drawtriangle} ${filltriangle} ${displaybitmap} ${displayinvertnormal} ${drawbitmapeg} ${scroll} "${text}" "${netsource}" 0 > /dev/null 2>&1 &

8
package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm
View File

@ -47,8 +47,12 @@
return resultStrList
end
local themepkg = ipkg.info("luci-theme-argon")
local theme_version = split(themepkg["luci-theme-argon"]["Version"],"-")
local themepkg = ipkg.info("luci-theme-argon*")
local theme_info
for k,v in pairs(themepkg) do
theme_info = v
end
local theme_version = split(theme_info["Version"],"-")
%>
</div>
<footer class="mobile-hide">