From 8cef5660177ee6f6b1b6949a5215aa82319b6065 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Wed, 17 Sep 2014 04:36:03 +0000 Subject: [PATCH] New tarball, same version. This adds UP support for -Cxx, showing min cpu speed as well. --- inxi | 7 +++++-- inxi.1 | 2 +- inxi.changelog | 12 ++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/inxi b/inxi index 9c806ae..90026b9 100755 --- a/inxi +++ b/inxi @@ -2813,7 +2813,7 @@ show_options() fi print_lines_basic "1" "-xx" "Show extra, extra data (only works with verbose or line output, not short form):" print_lines_basic "2" "-A" "Chip vendor:product ID for each audio device." - print_lines_basic "2" "-C" "Minimum CPU speed, if available (on > 1 core systems only)." + print_lines_basic "2" "-C" "Minimum CPU speed, if available." print_lines_basic "2" "-D" "Disk serial number." print_lines_basic "2" "-G" "Chip vendor:product ID for each video card." print_lines_basic "2" "-I" "Other detected installed gcc versions (if present). System default runlevel. Adds parent program (or tty) for shell info if not in IRC (like Konsole or Gterm). Adds Init/RC (if found) version number." @@ -10739,7 +10739,10 @@ print_cpu_data() fi # this handles bsd case unless we get a way to get max/min cpu speeds if [[ ${a_cpu_speeds[0]} != 'N/A' && ${a_cpu_speeds[2]} != 0 ]];then - if [[ ${a_cpu_speeds[0]} == ${a_cpu_speeds[2]} ]];then + if [[ ${#A_CPU_DATA[@]} -eq 1 && $B_SHOW_CPU == 'true' \ + && ${a_cpu_speeds[1]} != 0 ]];then + a_cpu_working[1]="${a_cpu_speeds[0]} MHz (min/max ${a_cpu_speeds[1]}/${a_cpu_speeds[2]})" + elif [[ ${a_cpu_speeds[0]} == ${a_cpu_speeds[2]} ]];then a_cpu_working[1]="${a_cpu_speeds[0]} MHz (max)" else a_cpu_working[1]="${a_cpu_speeds[0]} MHz (max ${a_cpu_speeds[2]})" diff --git a/inxi.1 b/inxi.1 index fe265f9..f439e08 100755 --- a/inxi.1 +++ b/inxi.1 @@ -368,7 +368,7 @@ version number, if available. \- Adds vendor:product ID of each Audio device. .TP .B \-xx \-C -\- Shows Minimum CPU speed (if available). Multicore / processor systems only. +\- Shows Minimum CPU speed (if available). .TP .B \-xx \-D \- Adds disk serial number. diff --git a/inxi.changelog b/inxi.changelog index 5257fdd..2b9bb43 100755 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,15 @@ +===================================================================================== +Version: 2.2.5 +Patch Version: 00 +Script Date: 2014-09-16 +----------------------------------- +Changes: +----------------------------------- +New tarball, same version. This adds UP support for -Cxx, showing min cpu speed as well. + +----------------------------------- +-- Harald Hope - Tue, 16 Sep 2014 21:35:06 -0700 + ===================================================================================== Version: 2.2.5 Patch Version: 00