dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-17 00:31:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test 10, found source of problem

Browse source
This commit is contained in:
inxi-svn 2008-12-13 21:06:04 +00:00
parent e558a1f832
commit 2a976358b3
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 0.8.5-b1-t9 #### version: 0.8.5-b1-t10
#### Date: December 12 2008 #### Date: December 12 2008
######################################################################## ########################################################################
#### inxi is a fork of infobash 3.02, the original bash sys info script by locsmif #### inxi is a fork of infobash 3.02, the original bash sys info script by locsmif
@ -306,14 +306,19 @@ error_handler()
exit $1 exit $1
} }
# args: $1 - $@ debugging string text; $2 - optional: type
script_debugger() script_debugger()
{ {
local a_debug_buffer='' local a_debug_buffer=''
if [[ $B_ALL_UP == 'true' ]];then print_screen_output "debugger gets this: $1"
if [[ $DEBUG -eq 0 ]];then
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 return
fi fi
print_screen_output "we in front of the dbi loop"
if [[ $DEBUG_BUFFER_INDEX -gt 0 ]];then if [[ $DEBUG_BUFFER_INDEX -gt 0 ]];then
for (( DEBUG_BUFFER_INDEX=0; DEBUG_BUFFER_INDEX < ${#a_debug_buffer[@]}; DEBUG_BUFFER_INDEX++ )) for (( DEBUG_BUFFER_INDEX=0; DEBUG_BUFFER_INDEX < ${#a_debug_buffer[@]}; DEBUG_BUFFER_INDEX++ ))
do do
@ -321,6 +326,7 @@ script_debugger()
done done
DEBUG_BUFFER_INDEX=0 DEBUG_BUFFER_INDEX=0
fi fi
print_screen_output "we got past the dbi loop"
print_screen_output "$@" print_screen_output "$@"
else else
if [[ $B_DEBUG_FLOOD == 'true' && $DEBUG_BUFFER_INDEX -gt 10 ]];then if [[ $B_DEBUG_FLOOD == 'true' && $DEBUG_BUFFER_INDEX -gt 10 ]];then
@ -421,19 +427,12 @@ check_script_depends()
if [[ ! -d /proc/ ]];then if [[ ! -d /proc/ ]];then
error_handler 6 error_handler 6
fi fi
# if [[ $B_TESTING_1 == 'true' ]];then
print_screen_output "B_X_RUNNING: $B_X_RUNNING"
# fi
if [[ $B_X_RUNNING == 'true' ]];then if [[ $B_X_RUNNING == 'true' ]];then
for app_name in xrandr xdpyinfo glxinfo for app_name in xrandr xdpyinfo glxinfo
do do
app_data=$( type -p $app_name ) 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 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" 'missing-app'
script_debugger "Resuming in non X mode: $app_name not found in path"
B_X_RUNNING='false' B_X_RUNNING='false'
break break
fi fi
@ -2375,12 +2374,6 @@ print_gfx_data()
local screen_resolution="$( get_graphics_res_data )" local screen_resolution="$( get_graphics_res_data )"
local b_is_mesa='false' 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 # set A_GFX_CARD_DATA
get_graphics_card_data get_graphics_card_data
# set A_X_DATA # set A_X_DATA
@ -2746,9 +2739,9 @@ if [[ $COLOR_SCHEME_SET != 'true' ]];then
set_color_scheme "$DEFAULT_SCHEME" set_color_scheme "$DEFAULT_SCHEME"
fi fi
# all the pre-start stuff is in place now
B_ALL_UP='true' 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 # then create the output
print_it_out print_it_out