added ability to shorten cpu output

usage: --cpu_shorthand (name, model, name_model, speed)
also edited config file to suit
This commit is contained in:
Andrew Titmuss 2016-03-11 08:27:00 +11:00
parent f845553a80
commit 5b6196f182
2 changed files with 34 additions and 0 deletions

View File

@ -93,6 +93,11 @@ shell_version="off"
# scaling_current, scaling_min, scaling_max # scaling_current, scaling_min, scaling_max
speed_type="max" speed_type="max"
# CPU shorthand
# Decice to show name only, model only, or speed only
# --cpu_shorthand name, model, name_model, speed, off
cpu_shorthand="off"
# GPU # GPU

View File

@ -113,6 +113,11 @@ shell_version="off"
# scaling_current, scaling_min, scaling_max # scaling_current, scaling_min, scaling_max
speed_type="max" speed_type="max"
# CPU shorthand
# Decice to show name only, model only, or speed only
# --cpu_shorthand name, model, name_model, speed, off
cpu_shorthand="off"
# GPU # GPU
@ -855,6 +860,27 @@ getcpu () {
cpu=${cpu// Six-Core} cpu=${cpu// Six-Core}
cpu=${cpu// Eight-Core} cpu=${cpu// Eight-Core}
cpu=${cpu// with Radeon HD Graphics} cpu=${cpu// with Radeon HD Graphics}
# Make the output of cpu shorter
case "$cpu_shorthand" in
"name")
cpu=${cpu%-*}
;;
"model")
cpu=${cpu#*-}
cpu=${cpu%% *}
;;
"name_model")
cpu=${cpu%@*}
cpu=${cpu# }
;;
"speed")
cpu=${cpu#*@ }
;;
esac
} }
# }}} # }}}
@ -2295,6 +2321,8 @@ usage () { cat << EOF
Possible values: current, min, max, bios, Possible values: current, min, max, bios,
scaling_current, scaling_min, scaling_max scaling_current, scaling_min, scaling_max
NOTE: This only support Linux with cpufreq. NOTE: This only support Linux with cpufreq.
--cpu_shorthand type Shorten the output of CPU
Possible values: name, model, name_model, speed
--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 --gpu_shorthand on/off Shorten the output of GPU
@ -2396,6 +2424,7 @@ while [ "$1" ]; do
--speed_type) speed_type="$2" ;; --speed_type) speed_type="$2" ;;
--kernel_shorthand) kernel_shorthand="$2" ;; --kernel_shorthand) kernel_shorthand="$2" ;;
--uptime_shorthand) uptime_shorthand="$2" ;; --uptime_shorthand) uptime_shorthand="$2" ;;
--cpu_shorthand) cpu_shorthand="$2" ;;
--gpu_shorthand) gpu_shorthand="$2" ;; --gpu_shorthand) gpu_shorthand="$2" ;;
--gtk_shorthand) gtk_shorthand="$2" ;; --gtk_shorthand) gtk_shorthand="$2" ;;
--gtk2) gtk2="$2" ;; --gtk2) gtk2="$2" ;;