diff --git a/inxi b/inxi index 4e7cfa4..df0b822 100755 --- a/inxi +++ b/inxi @@ -1,8 +1,8 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 1.5.10 -#### Date: May 29 2011 +#### version: 1.5.11 +#### Date: May 30 2011 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -1366,7 +1366,8 @@ debug_data_collector() ;; esac 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 '-------------------------' @@ -1836,9 +1837,10 @@ show_options() print_screen_output " 8 - Basic logging" print_screen_output " 9 - Full file/sys info 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 " 12 - No logging, creates tar.gz file of user data from lsusb/lspci/sensors, xorg data, glxinfo etc." - print_screen_output " 13 - No logging, creates tar.gz file of user data from lsusb/lspci/sensors, dev, disks, partitions etc." + print_screen_output " The following create a tar.gz file of system data, plus collecting the inxi output to file:" + print_screen_output " 11 - With data file of xiin read of /sys." + 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 print_screen_output " " print_screen_output "Developer and Testing Options (Advanced):" @@ -2213,7 +2215,7 @@ is_this_qt4_konvi() konvi_qt4="qt3" b_is_qt4='false' fi - + log_function_data "b_is_qt4: $b_is_qt4" echo $b_is_qt4 ## 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]}" @@ -2465,6 +2467,7 @@ get_console_irc_tty() print $7 }' ) fi + log_function_data "tty_number: $tty_number" echo $tty_number eval $LOGFE } @@ -5530,6 +5533,8 @@ print_gfx_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 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 screen_resolution="$( get_graphics_res_data )" # set A_GFX_CARD_DATA @@ -5559,24 +5564,43 @@ print_gfx_data() fi if [[ ${#A_GRAPHIC_DRIVERS[@]} -eq 0 ]];then - x_driver='N/A' + x_driver=' N/A' else for (( i=0; i < ${#A_GRAPHIC_DRIVERS[@]}; i++ )) do IFS="," a_gfx_working=( ${A_GRAPHIC_DRIVERS[i]} ) IFS="$ORIGINAL_IFS" - x_driver="$x_driver$spacer${a_gfx_working[0]}" - if [[ -n ${a_gfx_working[1]} ]];then - x_driver="$x_driver (${a_gfx_working[1]})" - fi - spacer=' ' + case ${a_gfx_working[1]} in + loaded) + loaded="$loaded$separator_loaded${a_gfx_working[0]}" + separator_loaded=',' + ;; + unloaded) + unloaded="$unloaded$separator_unloaded${a_gfx_working[0]}" + separator_unloaded=',' + ;; + failed) + failed="$failed$separator_failed${a_gfx_working[0]}" + separator_failed=',' + ;; + esac done 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 x_driver_plural='s' 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: if [[ -z $screen_resolution ]];then