From 5859a8c73d1bfa31938245ad6313620a84d63ece Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Sun, 29 May 2011 01:32:49 +0000 Subject: [PATCH] fixed a bug in gawk that gave multiple drivers for audio card. Added webcam to filter list. And this new number includes the fixes to graphics driver output as well --- inxi | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/inxi b/inxi index 91e515d..b3fd388 100755 --- a/inxi +++ b/inxi @@ -1,8 +1,8 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 1.5.8 -#### Date: May 27 2011 +#### version: 1.5.9 +#### Date: May 28 2011 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -2270,13 +2270,13 @@ get_audio_data() } # filtering out modems and usb devices like webcams, this might get a # usb audio card as well, this will take some trial and error - $0 !~ /modem/ || $0 !~ /usb/ { + $0 !~ /modem|usb|webcam/ { driver=gensub( /^(.+)( - )(.+)$/, "\\1", 1, $2 ) gsub(/^ +| +$/,"",driver) if ( driver != "" ){ print driver } - }' $FILE_ASOUND_DEVICE ) + }' $FILE_ASOUND_DEVICE ) log_function_data 'cat' "$FILE_ASOUND_DEVICE" fi @@ -3203,7 +3203,6 @@ get_graphics_driver() for driver in $driver_list do # note there appears to be different unload/failed syntax, so using simple conservative one - # I was not able to find a case where xorg.log shows unload and not fail if [[ -n $( grep -s "[[:space:]]Loading.*${driver}_drv.so" <<< "$xorg_log_data" ) ]];then if [[ -n $( grep -si "Failed.*${driver}_drv.so" <<< "$xorg_log_data" ) ]];then status='failed'