From 662de264505557bbdd59ff7a85a8d7ec11cdccb2 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Fri, 14 Nov 2008 01:01:44 +0000 Subject: [PATCH] Updated to 0.5.27 main, leaving in the E extras stuff --- inxi | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/inxi b/inxi index 21a1d8b..a776273 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 0.5.25-b-1-t-3 +#### version: 0.5.27-b-1-t-1 #### Date: November 13 2008 ######################################################################## #### inxi is a fork of infobash 3.02, the original bash sys info script by locsmif @@ -987,7 +987,7 @@ set_calculated_variables() #### ------------------------------------------------------------------- #### get data types #### ------------------------------------------------------------------- -## create array of sound cards installed on system +## create array of sound cards installed on system, and if found, use asound data as well get_audio_data() { local i='' alsa_index=0 @@ -1020,7 +1020,13 @@ get_audio_data() # now we'll add in the alsa data if the file exists alsa_index=${#A_AUDIO_DATA[@]} if [[ -e /proc/asound/version ]];then - A_AUDIO_DATA[$alsa_index]="$( cat /proc/asound/version ),alsa" + A_AUDIO_DATA[$alsa_index]=$( gawk '{ + { IGNORECASE=1 } + gsub( "Driver ","",$0 ) + if ( $0 != "" ){ + print $0 ",alsa" + } + }' /proc/asound/version ) fi } @@ -1933,6 +1939,7 @@ print_audio_data() if [[ ${a_audio_working[1]} == 'port' ]];then port_data=" ${C1}at port${C2} ${a_audio_working[2]}" fi + # we're testing for the presence of the 2nd array item here if [[ ${a_audio_working[1]} != 'alsa' ]];then audio_data="${C1}Card-$(( $i + 1 )) ${C2}${a_audio_working[0]}$port_data" else @@ -1944,6 +1951,7 @@ print_audio_data() fi } + print_cpu_data() { local cpu_data='' i='' cpu_clock_speed='' cpu_multi_clock_data=''