From 97c23714e81696c1374ed0cc802a1479e9b96471 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Thu, 27 Mar 2014 02:19:28 +0000 Subject: [PATCH] some tiny output adjustments, no new tarball --- inxi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/inxi b/inxi index ded67f6..34eeace 100755 --- a/inxi +++ b/inxi @@ -7698,6 +7698,7 @@ get_raid_component_data_bsd() zpool_status="$( zpool status $device )" # we will remove ONLINE for status and only use OFFLINE/DEGRADED as tests # for print output display of issues with components + # note: different zfs outputs vary, some have the components listed by line for component in ${a_raid_data[3]} do component_status=$( gawk ' @@ -9094,7 +9095,7 @@ print_short_data() local cpu_clock="${a_cpu_working[1]}" # old CPU3 # this gets that weird min/max final array item, which almost never contains any data of use local min_max_clock_nu=$(( ${#A_CPU_DATA[@]} - 1 )) - local min_max_clock=${A_CPU_DATA[$min_max_clock_nu]} + local min_max_clock=${A_CPU_DATA[$min_max_clock_nu]/.* Mhz/ Mhz} # this handles the case of for example ARM cpus, which will not have data for # min/max, since they don't have speed. Since that sets a flag, not found, just # look for that and use the speed from the first array array, same where we got @@ -9295,7 +9296,7 @@ print_cpu_data() local cpc_plural='' cpu_count_print='' model_plural='' cpu_data_string='' local cpu_physical_count='' cpu_core_count='' cpu_core_alpha='' cpu_type='' local cpu_2_data='' working_cpu='' - local line_starter="CPU$SEP3" multi_cpu_starter="${C1}Clock Speeds$SEP3${C2} " + local line_starter="CPU:" multi_cpu_starter="${C1}Clock Speeds$SEP3${C2} " ##print_screen_output "A_CPU_DATA[0]=\"${A_CPU_DATA[0]}\"" # Array A_CPU_DATA always has one extra element: max clockfreq found. @@ -9334,7 +9335,7 @@ print_cpu_data() cpu_count_print="$cpu_physical_count " model_plural='s' fi - line_starter="CPU$cpc_plural$SEP3" + line_starter="CPU$cpc_plural:" cpu_data_string="$cpu_count_print$cpu_core_alpha core" cpu_data="${C1}$cpu_data_string${C2} ${a_cpu_working[0]}$model_plural ($cpu_type)" if [[ $B_SHOW_CPU == 'true' ]];then