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

new version, 1.5.11

Browse source 
Improved loaded/unloaded/failed output for gfx driver, now lists them by categor, ie: loaded: ati,radeon unloaded: fbdev

This is because of the high count of loaded/unloaded drivers some systems show, especially for radeon/ati card types.

Added logging for inxi in debugger data collector, and include now the log file, that should be of use.
This commit is contained in:
inxi-svn 2011-05-30 18:51:31 +00:00
parent 242ae81dd0
commit 1e3003f2a3
1 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
inxi
View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 1.5.10 #### version: 1.5.11
#### Date: May 29 2011 #### Date: May 30 2011
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -1366,7 +1366,8 @@ debug_data_collector()
;; ;;
esac esac
echo 'Creating inxi output file now. This can take a few seconds...' echo 'Creating inxi output file now. This can take a few seconds...'
$SCRIPT_NAME -F$inxi_args -c 0 > $xiin_data_dir/inxi-F${inxi_args}.txt $SCRIPT_NAME -F$inxi_args -c 0 -@ 8 > $xiin_data_dir/inxi-F${inxi_args}.txt
cp $LOG_FILE $SCRIPT_DATA_DIR/$xiin_data_dir
echo 'Creating tar.gz compressed file of this material now. Contents:' echo 'Creating tar.gz compressed file of this material now. Contents:'
echo '-------------------------' echo '-------------------------'
@ -1836,9 +1837,10 @@ show_options()
print_screen_output " 8 - Basic logging" print_screen_output " 8 - Basic logging"
print_screen_output " 9 - Full file/sys info logging" print_screen_output " 9 - Full file/sys info logging"
print_screen_output " 10 - Color logging." print_screen_output " 10 - Color logging."
print_screen_output " 11 - No logging, creates tar.gz file of user data from lsusb/lspci/sensors, xiin read of /sys." print_screen_output " The following create a tar.gz file of system data, plus collecting the inxi output to file:"
print_screen_output " 12 - No logging, creates tar.gz file of user data from lsusb/lspci/sensors, xorg data, glxinfo etc." print_screen_output " 11 - With data file of xiin read of /sys."
print_screen_output " 13 - No logging, creates tar.gz file of user data from lsusb/lspci/sensors, dev, disks, partitions etc." print_screen_output " 12 - With xorg conf and log data, xrandr, xprop, xdpyinfo, glxinfo etc."
print_screen_output " 13 - With data from dev, disks, partitions etc."
if [[ $1 == 'full' ]];then if [[ $1 == 'full' ]];then
print_screen_output " " print_screen_output " "
print_screen_output "Developer and Testing Options (Advanced):" print_screen_output "Developer and Testing Options (Advanced):"
@ -2213,7 +2215,7 @@ is_this_qt4_konvi()
konvi_qt4="qt3" konvi_qt4="qt3"
b_is_qt4='false' b_is_qt4='false'
fi fi
log_function_data "b_is_qt4: $b_is_qt4"
echo $b_is_qt4 echo $b_is_qt4
## for testing this module ## for testing this module
#qdbus org.kde.konversation /irc say $1 $2 "getpid_dir: $konvi_qt4 qt4_konvi: $konvi_qt4_ver verNum: $konvi_qt4_ver_num pid: $konvi_pid ppid: $PPID konvi_home_dir: ${konvi[2]}" #qdbus org.kde.konversation /irc say $1 $2 "getpid_dir: $konvi_qt4 qt4_konvi: $konvi_qt4_ver verNum: $konvi_qt4_ver_num pid: $konvi_pid ppid: $PPID konvi_home_dir: ${konvi[2]}"
@ -2465,6 +2467,7 @@ get_console_irc_tty()
print $7 print $7
}' ) }' )
fi fi
log_function_data "tty_number: $tty_number"
echo $tty_number echo $tty_number
eval $LOGFE eval $LOGFE
} }
@ -5530,6 +5533,8 @@ print_gfx_data()
local b_is_mesa='false' display_full_string='' gfx_bus_id='' gfx_card_data='' local b_is_mesa='false' display_full_string='' gfx_bus_id='' gfx_card_data=''
local res_tty='Resolution' xorg_data='' x_vendor_string='' line_max='160' local res_tty='Resolution' xorg_data='' x_vendor_string='' line_max='160'
local spacer='' x_driver='' x_driver_string='' x_driver_plural='' direct_render_string='' local spacer='' x_driver='' x_driver_string='' x_driver_plural='' direct_render_string=''
local separator_loaded='' separator_unloaded='' separator_failed=''
local loaded='' unloaded='' failed=''
local line_starter='Graphics:' local line_starter='Graphics:'
local screen_resolution="$( get_graphics_res_data )" local screen_resolution="$( get_graphics_res_data )"
# set A_GFX_CARD_DATA # set A_GFX_CARD_DATA
@ -5559,24 +5564,43 @@ print_gfx_data()
fi fi
if [[ ${#A_GRAPHIC_DRIVERS[@]} -eq 0 ]];then if [[ ${#A_GRAPHIC_DRIVERS[@]} -eq 0 ]];then
x_driver='N/A' x_driver=' N/A'
else else
for (( i=0; i < ${#A_GRAPHIC_DRIVERS[@]}; i++ )) for (( i=0; i < ${#A_GRAPHIC_DRIVERS[@]}; i++ ))
do do
IFS="," IFS=","
a_gfx_working=( ${A_GRAPHIC_DRIVERS[i]} ) a_gfx_working=( ${A_GRAPHIC_DRIVERS[i]} )
IFS="$ORIGINAL_IFS" IFS="$ORIGINAL_IFS"
x_driver="$x_driver$spacer${a_gfx_working[0]}" case ${a_gfx_working[1]} in
if [[ -n ${a_gfx_working[1]} ]];then loaded)
x_driver="$x_driver (${a_gfx_working[1]})" loaded="$loaded$separator_loaded${a_gfx_working[0]}"
fi separator_loaded=','
spacer=' ' ;;
unloaded)
unloaded="$unloaded$separator_unloaded${a_gfx_working[0]}"
separator_unloaded=','
;;
failed)
failed="$failed$separator_failed${a_gfx_working[0]}"
separator_failed=','
;;
esac
done done
fi fi
if [[ -n $loaded ]];then
x_driver="${x_driver} loaded: $loaded"
fi
if [[ -n $unloaded ]];then
x_driver="${x_driver} unloaded: $unloaded"
fi
if [[ -n $failed ]];then
x_driver="${x_driver} FAILED: $failed"
fi
if [[ ${#A_GRAPHIC_DRIVERS[@]} -gt 1 ]];then if [[ ${#A_GRAPHIC_DRIVERS[@]} -gt 1 ]];then
x_driver_plural='s' x_driver_plural='s'
fi fi
x_driver_string="${C1}driver$x_driver_plural${C2} $x_driver " x_driver_string="${C1}driver$x_driver_plural${C2}$x_driver "
# some basic error handling: # some basic error handling:
if [[ -z $screen_resolution ]];then if [[ -z $screen_resolution ]];then