Fixed broken CPU speed on linux when /sys/ wasn't available

This commit is contained in:
Dylan 2016-03-27 11:59:01 +11:00
parent 0c5869da38
commit eacce05f3a

View file

@ -826,12 +826,11 @@ getcpu () {
read -r speed < \ read -r speed < \
/sys/devices/system/cpu/cpu0/cpufreq/${speed_type} /sys/devices/system/cpu/cpu0/cpufreq/${speed_type}
speed=$((speed / 100000))
else else
speed=$(awk -F ': |\\.' '/cpu MHz/ {printf $2; exit}' /proc/cpuinfo) speed=$(awk -F ': |\\.' '/cpu MHz/ {printf $2; exit}' /proc/cpuinfo)
speed=$((speed / 100))
fi fi
# Convert mhz to ghz without bc
speed=$((speed / 100000))
speed=${speed:0:1}.${speed:1} speed=${speed:0:1}.${speed:1}
cpu="$cpu @ ${speed}GHz" cpu="$cpu @ ${speed}GHz"
@ -903,7 +902,7 @@ getcpu () {
# Add cpu cores to output # Add cpu cores to output
[ "$cpu_cores" == "on" ] && [ ! -z "$cores" ] && \ [ "$cpu_cores" == "on" ] && [ ! -z "$cores" ] && \
cpu=${cpu/ @/ \(${cores}\) @} cpu=${cpu/@/\(${cores}\) @}
# Make the output of cpu shorter # Make the output of cpu shorter
case "$cpu_shorthand" in case "$cpu_shorthand" in