EvolutionOS
/
neofetch
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added CPU cores to CPU output

This commit is contained in:
Andrew Titmuss 2016-03-15 18:55:35 +11:00
parent 26c04cf753
commit c98d8f1196
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -293,6 +293,7 @@ alias fetch2="fetch \
NOTE: This only support Linux with cpufreq. NOTE: This only support Linux with cpufreq.
--cpu_shorthand type Shorten the output of CPU --cpu_shorthand type Shorten the output of CPU
Possible values: name, speed, tiny, on, off Possible values: name, speed, tiny, on, off
--cpu_cores on/off Whether or not to display the number of CPU cores
--kernel_shorthand on/off Shorten the output of kernel --kernel_shorthand on/off Shorten the output of kernel
--uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off)
--gpu_shorthand on/off Shorten the output of GPU (tiny, on, off) --gpu_shorthand on/off Shorten the output of GPU (tiny, on, off)

5
config/config
View File

@ -103,6 +103,11 @@ speed_type="max"
cpu_shorthand="off" cpu_shorthand="off"
cpu_display="off" cpu_display="off"
# CPU Cores
# Display CPU cores in output
# --cpu_cores on/off
cpu_cores="on"
# GPU # GPU

15
neofetch
View File

@ -125,6 +125,10 @@ speed_type="max"
cpu_shorthand="off" cpu_shorthand="off"
cpu_display="off" cpu_display="off"
# CPU Cores
# Display CPU cores in output
# --cpu_cores on/off
cpu_cores="on"
# GPU # GPU
@ -849,8 +853,6 @@ getcpu () {
speed=${speed:0:1}.${speed:1} speed=${speed:0:1}.${speed:1}
cpu="$cpu @ ${speed}GHz" cpu="$cpu @ ${speed}GHz"
# Get cpu cores
cores=$(awk -F ': ' '/siblings/ {printf $2; exit}' /proc/cpuinfo) cores=$(awk -F ': ' '/siblings/ {printf $2; exit}' /proc/cpuinfo)
;; ;;
@ -875,8 +877,6 @@ getcpu () {
"FreeBSD"*) speed=$(sysctl -n hw.clockrate) ;; "FreeBSD"*) speed=$(sysctl -n hw.clockrate) ;;
esac esac
speed=$((speed / 100)) speed=$((speed / 100))
# Get cpu cores
cores=$(sysctl -n hw.ncpu) cores=$(sysctl -n hw.ncpu)
;; ;;
@ -897,8 +897,6 @@ getcpu () {
"NetBSD"*) speed=$((speed / 10000)) ;; "NetBSD"*) speed=$((speed / 10000)) ;;
"Windows"*) speed=$((speed / 100000)) ;; "Windows"*) speed=$((speed / 100000)) ;;
esac esac
# Get cpu cores
cores=$(awk -F ': ' '/siblings/ {printf $2; exit}' /proc/cpuinfo) cores=$(awk -F ': ' '/siblings/ {printf $2; exit}' /proc/cpuinfo)
;; ;;
esac esac
@ -924,6 +922,10 @@ getcpu () {
cpu=${cpu// Eight-Core} cpu=${cpu// Eight-Core}
cpu=${cpu// with Radeon HD Graphics} cpu=${cpu// with Radeon HD Graphics}
# Add cpu cores to output
[ "$cpu_cores" == "on" ] && \
cpu=${cpu/@/\(${cores}\) @}
# Make the output of cpu shorter # Make the output of cpu shorter
case "$cpu_shorthand" in case "$cpu_shorthand" in
"name") "name")
@ -2489,6 +2491,7 @@ usage () { cat << EOF
NOTE: This only support Linux with cpufreq. NOTE: This only support Linux with cpufreq.
--cpu_shorthand type Shorten the output of CPU --cpu_shorthand type Shorten the output of CPU
Possible values: name, speed, tiny, on, off Possible values: name, speed, tiny, on, off
--cpu_cores on/off Whether or not to display the number of CPU cores
--kernel_shorthand on/off Shorten the output of kernel --kernel_shorthand on/off Shorten the output of kernel
--uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off)
--gpu_shorthand on/off Shorten the output of GPU (tiny, on, off) --gpu_shorthand on/off Shorten the output of GPU (tiny, on, off)

3
neofetch.1
View File

@ -41,6 +41,9 @@ Shorten the output of CPU
.br .br
Possible values: name, speed, tiny, on, off Possible values: name, speed, tiny, on, off
.TP .TP
.B \--cpu_cores 'on/off'
Whether or not to display the number of CPU cores
.TP
.B \--kernel_shorthand 'on/off' .B \--kernel_shorthand 'on/off'
Shorten the output of kernel Shorten the output of kernel
.TP .TP