diff --git a/CustomFiles/Depends/cpuinfo_x86 b/CustomFiles/Depends/cpuinfo_x86 index 5c64224..f39e6a7 100755 --- a/CustomFiles/Depends/cpuinfo_x86 +++ b/CustomFiles/Depends/cpuinfo_x86 @@ -1,5 +1,5 @@ #!/bin/sh MHz_AVG="$(echo "$(grep 'MHz' /proc/cpuinfo | awk '{Freq_Sum += $4};END {print Freq_Sum}') / $(grep 'processor' /proc/cpuinfo | sort -u | wc -l)" | bc)" -TEMP="$(sensors 2>/dev/null | grep 'Core 0' | awk '{print $3}' | cut -d '+' -f2)" -echo "$MHz_AVG MHz (CPU: $TEMP)" -sleep 1 \ No newline at end of file +TEMP="$(echo "$(sensors 2>/dev/null | grep Core | awk '{Sum += $3};END {print Sum}') / $(sensors 2>/dev/null | grep Core | wc -l)" | bc)" +echo "$MHz_AVG MHz (CPU: ${TEMP}°C)" +sleep 1 diff --git a/CustomFiles/Depends/profile b/CustomFiles/Depends/profile index 74c953a..8dc88ce 100644 --- a/CustomFiles/Depends/profile +++ b/CustomFiles/Depends/profile @@ -4,7 +4,7 @@ Sysinfo() { [ -z "${TARGET_PROFILE}" ] && local TARGET_PROFILE=$(jsonfilter -e '@.model.id' < /etc/board.json | tr ',' '_') local CoreMark=$([ -f /etc/bench.log ] && egrep -o "[0-9]+" /etc/bench.log | awk 'NR==1') local Startup=$(awk '{a=$1/86400;b=($1%86400)/3600;c=($1%3600)/60;d=($1%60)} {printf("%d 天 %d 小时 %d 分钟 %d 秒\n",a,b,c,d)}' /proc/uptime) - local TEMP=$(sensors 2>/dev/null | grep 'Core 0' | awk '{print $3}' | cut -d '+' -f2 | cut -d '.' -f1 | awk '{a=$1;b=32+$1*1.8} {printf("%d°C \e[36m|\e[0m %.1f°F\n",a,b)}') + local TEMP=$(echo "$(sensors 2>/dev/null | grep Core | awk '{Sum += $3};END {print Sum}') / $(sensors 2>/dev/null | grep Core | wc -l)" | bc | awk '{a=$1;b=32+$1*1.8} {printf("%d°C \e[36m|\e[0m %.1f°F\n",a,b)}') echo echo -e " 设备信息: ${Yellow}${TARGET_PROFILE} ${Div} $(uname -n)" echo -e " 内核版本: K$(uname -rs | egrep -o "[0-9].+")"