From 1c7a7ac7bfac0ff0676dcc4218e655406e4d3756 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Wed, 6 Jul 2011 01:51:20 +0000 Subject: [PATCH] added some to debugger, protect against bad gcc as well --- inxi | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/inxi b/inxi index 88cf75f..8c103e6 100755 --- a/inxi +++ b/inxi @@ -3,7 +3,7 @@ #### Script Name: inxi #### version: 1.7.13 #### Date: July 5 2011 -#### Patch Number: 06 +#### Patch Number: 07 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -1278,6 +1278,8 @@ debug_data_collector() lspci -v &> $debug_data_dir/lspci-v.txt ps aux &> $debug_data_dir/ps-aux.txt sensors &> $debug_data_dir/sensors.txt + ls /usr/bin/gcc-* &> $debug_data_dir/gcc-sys-versions.txt + gcc --version &> $debug_data_dir/gcc-version.txt cat $FILE_LSB_RELEASE &> $debug_data_dir/lsb-release.txt cat $FILE_ASOUND_DEVICE &> $debug_data_dir/proc-asound-device.txt cat $FILE_ASOUND_VERSION &> $debug_data_dir/proc-asound-version.txt @@ -3499,7 +3501,10 @@ get_gcc_system_version() if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then for item in $gcc_others do - gcc_installed=$( basename $item | gawk -F '-' '{print $2}' ) + gcc_installed=$( basename $item | gawk -F '-' ' + $2 ~ /^[0-9\.]+$/ { + print $2 + }' ) if [[ -n $gcc_installed && -z $( grep "^$gcc_installed" <<< $gcc_version ) ]];then gcc_list=$gcc_list$separator$gcc_installed separator=','