From 51ab997a54f56495b0a2eae2a0ae9aba34e34ca9 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Tue, 28 Jul 2020 16:04:46 +0800
Subject: [PATCH 1/2] luci-theme-argonv3: sync with upstream source

---
 .../luasrc/view/themes/argon/footer.htm                   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm
index 77278bb5d5..a9b13c15e4 100644
--- a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm
+++ b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm
@@ -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">

From f8ecec1d7617b224e64b52ee9b63032f2e655ad7 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Tue, 28 Jul 2020 16:07:42 +0800
Subject: [PATCH 2/2] luci-app-oled: sync with upstream source

---
 .../ctcgfw/luci-app-oled/root/etc/init.d/oled   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/package/ctcgfw/luci-app-oled/root/etc/init.d/oled b/package/ctcgfw/luci-app-oled/root/etc/init.d/oled
index 499df12787..84856bc684 100755
--- a/package/ctcgfw/luci-app-oled/root/etc/init.d/oled
+++ b/package/ctcgfw/luci-app-oled/root/etc/init.d/oled
@@ -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 &