From 9fe5b7b1b8af12155056e8795cdeca4cbad0bd4c Mon Sep 17 00:00:00 2001 From: Harald Hope Date: Thu, 8 Jun 2017 22:04:31 -0700 Subject: [PATCH] had to remove -B option from glxinfo, already got a user dataset that shows -B not supported in their relatively recent glxinfo in their --- inxi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/inxi b/inxi index f0d9e75..d7cca91 100755 --- a/inxi +++ b/inxi @@ -6409,7 +6409,8 @@ get_graphics_glx_data() # if [[ $B_SHOW_DISPLAY_DATA == 'true' && $B_ROOT != 'true' ]];then if [[ $B_SHOW_DISPLAY_DATA == 'true' ]];then IFS=$'\n' - A_GLX_DATA=( $( eval glxinfo -B $DISPLAY_OPT 2>/dev/null | gawk -F ': ' ' + # NOTE: glxinfo -B is not always available, unforunately + A_GLX_DATA=( $( eval glxinfo $DISPLAY_OPT 2>/dev/null | gawk -F ': ' ' # the real question here though is why this function is even here, seems # just to be a complicated way to pack/print a variable, but maybe the # original idea was to handle > 1 cases of detections I guess @@ -6469,6 +6470,10 @@ get_graphics_glx_data() /direct rendering/ { $2 && c[$2] } + # if -B was always available, we could skip this, but it is not + /GLX Visuals/ { + exit + } END { dr = join( c, ", " ) oglr = join( a, ", " )