mirror of
https://github.com/smxi/inxi.git
synced 2024-11-17 00:31:19 +00:00
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
This commit is contained in:
parent
ea906053e7
commit
5859a8c73d
9
inxi
9
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'
|
||||
|
|
Loading…
Reference in a new issue