diff --git a/inxi b/inxi index 2ce1668..30f9edd 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 1.0.7-b1-t4 +#### version: 1.0.8 #### Date: 13 March 2009 ######################################################################## #### SPECIAL THANKS @@ -1942,12 +1942,7 @@ get_graphics_glx_data() printf( "%s\n%s\n%s\n", join( a, ", " ), join( b, ", " ), join( c, ", " ) ) }' ) ) IFS="$ORIGINAL_IFS" - echo A_GLX_DATA: ${A_GLX_DATA[@]} - echo A_GLX_DATA 0: ${A_GLX_DATA[0]} - echo A_GLX_DATA 1: ${A_GLX_DATA[1]} - echo A_GLX_DATA 2: ${A_GLX_DATA[2]} - echo A_GLX_DATA 3: ${A_GLX_DATA[3]} - echo A_GLX_DATA 4: ${A_GLX_DATA[4]} + # GLXR=$(glxinfo | gawk -F ': ' 'BEGIN {IGNORECASE=1} /opengl renderer/ && $2 !~ /mesa/ {seen[$2]++} END {for (i in seen) {printf("%s ",i)}}') # GLXV=$(glxinfo | gawk -F ': ' 'BEGIN {IGNORECASE=1} /opengl version/ && $2 !~ /mesa/ {seen[$2]++} END {for (i in seen) {printf("%s ",i)}}') fi @@ -3079,6 +3074,7 @@ print_gfx_data() local glx_renderer="${A_GLX_DATA[0]}" local glx_version="${A_GLX_DATA[1]}" # this can contain a long No case debugging message, so it's being sliced off + # note: using grep -ioE '(No|Yes)' <<< ${A_GLX_DATA[2]} did not work in Arch, no idea why local glx_direct_render=$( gawk '{ print $1 }' <<< "${A_GLX_DATA[2]}" ) @@ -3110,8 +3106,6 @@ print_gfx_data() if [[ $B_X_RUNNING == 'true' ]];then gfx_data=$( create_print_line " " "${C1}GLX Renderer${C2} ${glx_renderer} ${C1}GLX Version${C2} ${glx_version}${CN}" ) if [[ $B_HANDLE_CORRUPT_DATA == 'true' || $B_EXTRA_DATA == 'true' ]];then - echo glx_direct_render ${glx_direct_render} - echo 'A_GLX_DATA[2]' ${A_GLX_DATA[2]} gfx_data="$gfx_data ${C1}Direct Rendering${C2} ${glx_direct_render}${CN}" fi print_screen_output "$gfx_data"