dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-17 00:31:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed a bug in gawk that gave multiple drivers for audio card.

Browse source 
Added webcam to filter list.

And this new number includes the fixes to graphics driver output as well
This commit is contained in:
inxi-svn 2011-05-29 01:32:49 +00:00
parent ea906053e7
commit 5859a8c73d
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
inxi
View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 1.5.8 #### version: 1.5.9
#### Date: May 27 2011 #### Date: May 28 2011
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -2270,13 +2270,13 @@ get_audio_data()
} }
# filtering out modems and usb devices like webcams, this might get a # filtering out modems and usb devices like webcams, this might get a
# usb audio card as well, this will take some trial and error # 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 ) driver=gensub( /^(.+)( - )(.+)$/, "\\1", 1, $2 )
gsub(/^ +| +$/,"",driver) gsub(/^ +| +$/,"",driver)
if ( driver != "" ){ if ( driver != "" ){
print driver print driver
} }
}' $FILE_ASOUND_DEVICE ) }' $FILE_ASOUND_DEVICE )
log_function_data 'cat' "$FILE_ASOUND_DEVICE" log_function_data 'cat' "$FILE_ASOUND_DEVICE"
fi fi
@ -3203,7 +3203,6 @@ get_graphics_driver()
for driver in $driver_list for driver in $driver_list
do do
# note there appears to be different unload/failed syntax, so using simple conservative one # 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 -s "[[:space:]]Loading.*${driver}_drv.so" <<< "$xorg_log_data" ) ]];then
if [[ -n $( grep -si "Failed.*${driver}_drv.so" <<< "$xorg_log_data" ) ]];then if [[ -n $( grep -si "Failed.*${driver}_drv.so" <<< "$xorg_log_data" ) ]];then
status='failed' status='failed'