CPU: Simplify format check

This commit is contained in:
Dylan Araps 2016-12-14 11:45:33 +11:00
parent f7686ee8e8
commit dc08df12ac
1 changed files with 9 additions and 16 deletions

View File

@ -862,26 +862,19 @@ get_cpu() {
;;
esac
# Format the output
case "$os" in
"Mac OS X" | "iPhone OS") ;;
*)
# Fix for speeds under 1ghz
if [[ -z "${speed:1}" ]]; then
speed="0.${speed}"
else
speed="${speed:0:1}.${speed:1}"
fi
# Fix for speeds under 1ghz
if [[ "$speed" ]]; then
if [[ -z "${speed:1}" ]]; then
speed="0.${speed}"
else
speed="${speed:0:1}.${speed:1}"
fi
cpu="$cpu @ ${speed}GHz $temp"
;;
esac
cpu="$cpu @ ${speed}GHz $temp"
fi
# Remove uneeded patterns from cpu output
# This is faster than sed/gsub
cpu="${cpu//(tm)}"
cpu="${cpu//(TM)}"
cpu="${cpu//(r)}"
cpu="${cpu//(R)}"
cpu="${cpu//CPU}"
cpu="${cpu//Processor}"