diff --git a/inxi b/inxi index b0111d3..a0c3ccb 100755 --- a/inxi +++ b/inxi @@ -1,8 +1,8 @@ #!/usr/bin/env bash ######################################################################## #### Script Name: inxi -#### Version: 1.9.11 -#### Date: July 2 2013 +#### Version: 1.9.12 +#### Date: August 12 2013 #### Patch Number: 01-b1 ######################################################################## #### SPECIAL THANKS @@ -4303,7 +4303,7 @@ get_distro_lsb_os_release_data() # sometimes some distros cannot do their lsb-release files correctly, so here is # one last chance to get it right. /^DISTRIB_DESCRIPTION/ { -s if ( $2 != "n/a" ) { + if ( $2 != "n/a" ) { distroDescription = $2 } } @@ -4709,6 +4709,7 @@ get_graphics_driver() gawk ' BEGIN { driver="" + bLoaded="false" } /[[:space:]]Loading.*('"$driver_list"')_drv.so$/ { driver=gensub(/.*[[:space:]]Loading.*('"$driver_list"')_drv.so/, "\\1", 1, $0 ) @@ -4733,6 +4734,18 @@ get_graphics_driver() aDrivers[driver]="failed" } } + # verify that the driver actually started the desktop, even with false failed messages which can occur + # this is the driver that is actually driving the display + /^\[.*:\sDepth.*framebuffer/ { + driver=gensub(/^\[.*('"$driver_list"').*:\sDepth.*framebuffer.*/, "\\1", 1, $0 ) + if ( driver == $0 ) { + gensub(/^\[.*('"$driver_list"').*:\sDepth.*framebuffer.*|fred/, "\\1", 1, $0 ) + } + # we need to make sure that the driver has already been truly loaded, not just discussed + if ( driver != $0 && driver in aDrivers ) { + aDrivers[driver]="loaded" + } + } END { for ( driver in aDrivers ) { print driver "," aDrivers[driver]