From 2a976358b3b5c65e19ee0b8f49e4f2e7441f993d Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Sat, 13 Dec 2008 21:06:04 +0000 Subject: [PATCH] test 10, found source of problem --- inxi | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/inxi b/inxi index 72e367f..73d5c8e 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 0.8.5-b1-t9 +#### version: 0.8.5-b1-t10 #### Date: December 12 2008 ######################################################################## #### inxi is a fork of infobash 3.02, the original bash sys info script by locsmif @@ -306,14 +306,19 @@ error_handler() exit $1 } +# args: $1 - $@ debugging string text; $2 - optional: type script_debugger() { local a_debug_buffer='' - if [[ $B_ALL_UP == 'true' ]];then - if [[ $DEBUG -eq 0 ]];then + print_screen_output "debugger gets this: $1" + + if [[ $B_ALL_UP == 'true' || $2 == 'missing-app' ]];then + # only return if not app missing or no debugger + if [[ $DEBUG -eq 0 && $2 != 'missing-app' ]];then return fi + print_screen_output "we in front of the dbi loop" if [[ $DEBUG_BUFFER_INDEX -gt 0 ]];then for (( DEBUG_BUFFER_INDEX=0; DEBUG_BUFFER_INDEX < ${#a_debug_buffer[@]}; DEBUG_BUFFER_INDEX++ )) do @@ -321,6 +326,7 @@ script_debugger() done DEBUG_BUFFER_INDEX=0 fi + print_screen_output "we got past the dbi loop" print_screen_output "$@" else if [[ $B_DEBUG_FLOOD == 'true' && $DEBUG_BUFFER_INDEX -gt 10 ]];then @@ -421,19 +427,12 @@ check_script_depends() if [[ ! -d /proc/ ]];then error_handler 6 fi -# if [[ $B_TESTING_1 == 'true' ]];then - print_screen_output "B_X_RUNNING: $B_X_RUNNING" -# fi if [[ $B_X_RUNNING == 'true' ]];then for app_name in xrandr xdpyinfo glxinfo do app_data=$( type -p $app_name ) -# if [[ $B_TESTING_1 == 'true' ]];then - print_screen_output "gfx app tests: app_data:$app_data:" -# fi if [[ -z $app_data ]];then - print_screen_output "gfx app tests: app_name not found in path:$app_name:" - script_debugger "Resuming in non X mode: $app_name not found in path" + script_debugger "Resuming in non X mode: $app_name not found in path" 'missing-app' B_X_RUNNING='false' break fi @@ -2375,12 +2374,6 @@ print_gfx_data() local screen_resolution="$( get_graphics_res_data )" local b_is_mesa='false' - if [[ $B_TESTING_1 == 'true' ]];then - #print_screen_output "B_X_RUNNING: $B_X_RUNNING" - #print_screen_output "DEBUG: $DEBUG" - : - fi - # set A_GFX_CARD_DATA get_graphics_card_data # set A_X_DATA @@ -2746,9 +2739,9 @@ if [[ $COLOR_SCHEME_SET != 'true' ]];then set_color_scheme "$DEFAULT_SCHEME" fi +# all the pre-start stuff is in place now B_ALL_UP='true' -script_debugger "B_ALL_UP=true : inxi up and running.." - +script_debugger "Debugger: inxi up and running.." # then create the output print_it_out