From 2a4203c81e2bd0e99431f0cf68001e26f55eb5ad Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Sat, 6 Feb 2021 04:10:25 +0800
Subject: [PATCH] autocore: style improvements

Acked-by: AmadeusGhost <amadeus@project-openwrt.eu.org>
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
---
 package/lean/autocore/Makefile               |  2 +-
 package/lean/autocore/files/arm/sbin/cpuinfo | 35 +++++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile
index 1348a9fccf..94bcf509a0 100644
--- a/package/lean/autocore/Makefile
+++ b/package/lean/autocore/Makefile
@@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=autocore
 PKG_VERSION:=1
-PKG_RELEASE:=38
+PKG_RELEASE:=39
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/lean/autocore/files/arm/sbin/cpuinfo b/package/lean/autocore/files/arm/sbin/cpuinfo
index 8e1d2d919a..1ea33f869e 100755
--- a/package/lean/autocore/files/arm/sbin/cpuinfo
+++ b/package/lean/autocore/files/arm/sbin/cpuinfo
@@ -10,28 +10,23 @@ elif grep -q "bcm53xx" "/etc/openwrt_release"; then
 	cpu_freq="$(nvram get clkfreq | awk -F ',' '{print $1}')MHz"
 elif grep -q "mvebu" "/etc/openwrt_release"; then
 	cpu_freq="$(cat "/proc/cpuinfo" | grep "BogoMIPS" | sed -n "1p" | awk -F ': ' '{print $2}')MHz"
-else
-	cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq) / 1000)MHz"
+elif [ -e "/sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq" ]; then
+	cpu_freq="$(expr $(cat "/sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq") / 1000)MHz"
 fi
 
-if grep -q "ipq" "/etc/openwrt_release"; then
+if grep -q "bcm27xx" "/etc/openwrt_release"; then
+	cpu_temp="$(vcgencmd measure_temp | awk -F '=' '{print $2}' | awk -F "'" '{print $1}')°C"
+else
+	[ -e "/sys/class/thermal/thermal_zone0/temp" ] && \
+		cpu_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat "/sys/class/thermal/thermal_zone0/temp")/1000)}")°C"
+fi
+
+if [ -z "${cpu_freq}" ] && [ -z "${cpu_temp}" ]; then
+	echo -n "${cpu_arch} x ${cpu_cores}"
+elif [ -z "${cpu_temp}" ] || grep -q "ipq" "/etc/openwrt_release"; then
 	echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq})"
+elif [ -z "${cpu_freq}" ]; then
+	echo -n "${cpu_arch} x ${cpu_cores} (${cpu_temp})"
 else
-	if grep -q "bcm27xx" "/etc/openwrt_release"; then
-		cpu_temp="$(vcgencmd measure_temp | awk -F '=' '{print $2}' | awk -F "'" '{print $1}')°C"
-	else
-		if [ -f /sys/class/thermal/thermal_zone0/temp ]; then
-			cpu_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C"
-		fi
-	fi
-
-	if grep -q "sunxi" "/etc/openwrt_release"; then
-		if [ -f /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq ]; then
-			echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq})"
-		else
-			echo -n "${cpu_arch} x ${cpu_cores}"
-		fi
-	else
-		echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq}, ${cpu_temp})"
-	fi
+	echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq}, ${cpu_temp})"
 fi