Skip to content

N
neofetch
Commit 2e1c9424 authored by Muhammad Herdiansyah's avatar Muhammad Herdiansyah
Browse files
Options

CPU [Speed]: Use the cpu_cores approach instead of deleting it manually.

This way, we don't have to replace the "@" with "($cores) @" and remove the CPU speed from the output.
parent 1378d3b3
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 14 deletions
neofetch
View file @ 2e1c9424
...@@ -1013,16 +1013,6 @@ get_cpu() { ...@@ -1013,16 +1013,6 @@ get_cpu() {
;; ;;
esac esac
if [[ "$speed" ]]; then
if (( speed < 1000 )); then
cpu="$cpu @ ${speed}MHz $temp"
else
[[ "$speed_shorthand" == "on" ]] && speed="$((speed / 100))"
speed="${speed:0:1}.${speed:1}"
cpu="$cpu @ ${speed}GHz $temp"
fi
fi
# Remove un-needed patterns from cpu output. # Remove un-needed patterns from cpu output.
cpu="${cpu//(TM)}" cpu="${cpu//(TM)}"
cpu="${cpu//(tm)}" cpu="${cpu//(tm)}"
...@@ -1047,11 +1037,18 @@ get_cpu() { ...@@ -1047,11 +1037,18 @@ get_cpu() {
# Add CPU cores to the output. # Add CPU cores to the output.
[[ "$cpu_cores" != "off" && "$cores" ]] && \ [[ "$cpu_cores" != "off" && "$cores" ]] && \
cpu="${cpu/@/(${cores}) @}" cpu="$cpu ($cores)"
# Remove CPU speed from the output. # Add CPU speed to the output.
[[ "$cpu_speed" == "off" ]] && \ if [[ "$cpu_speed" != "off" && "$speed" ]]; then
cpu="${cpu/@ *GHz}" if (( speed < 1000 )); then
cpu="$cpu @ ${speed}MHz $temp"
else
[[ "$speed_shorthand" == "on" ]] && speed="$((speed / 100))"
speed="${speed:0:1}.${speed:1}"
cpu="$cpu @ ${speed}GHz $temp"
fi
fi
# Make the output of CPU shorter. # Make the output of CPU shorter.
case "$cpu_shorthand" in case "$cpu_shorthand" in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment