patch, for debugging tools, added python version, tweaked a few other things.

This commit is contained in:
inxi-svn 2011-06-25 18:33:50 +00:00
parent 951d3b7814
commit 9cff4f10f2

21
inxi
View file

@ -3,7 +3,7 @@
#### Script Name: inxi #### Script Name: inxi
#### version: 1.7.12 #### version: 1.7.12
#### Date: June 25 2011 #### Date: June 25 2011
#### Patch Number: 04 #### Patch Number: 05
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -1283,7 +1283,7 @@ debug_data_collector()
# first download and verify xiin # first download and verify xiin
if [[ $B_UPLOAD_DEBUG_DATA == 'true' || $1 == 'disk' || $1 == 'sys' || $1 == 'all' ]];then if [[ $B_UPLOAD_DEBUG_DATA == 'true' || $1 == 'disk' || $1 == 'sys' || $1 == 'all' ]];then
touch $debug_data_dir/xiin-error.txt touch $debug_data_dir/xiin-error.txt
echo 'Downloading required tree traverse tool xiin...' echo "Downloading required tree traverse tool $xiin_file..."
if [[ -f xiin && ! -f $xiin_file ]];then if [[ -f xiin && ! -f $xiin_file ]];then
mv -f xiin $xiin_file mv -f xiin $xiin_file
fi fi
@ -1430,6 +1430,7 @@ debug_data_collector()
check_recommends() check_recommends()
{ {
local Line='-----------------------------------------------------------------------------------------' local Line='-----------------------------------------------------------------------------------------'
local gawk_version='N/A' sed_version='N/A' sudo_version='N/A' python_version='N/A'
if ! tty >/dev/null;then if ! tty >/dev/null;then
print_screen_output "Sorry, you can't run this option in an IRC client." print_screen_output "Sorry, you can't run this option in an IRC client."
@ -1438,18 +1439,26 @@ check_recommends()
initialize_script_paths initialize_script_paths
echo "$SCRIPT_NAME will now begin checking for the programs it needs to operate." echo "$SCRIPT_NAME will now begin checking for the programs it needs to operate. First a check of"
echo "the main languages and tools $SCRIPT_NAME uses. Python is only for debugging data collection."
echo $Line echo $Line
echo "Bash version: $( bash --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU bash/ {print $4}' )" echo "Bash version: $( bash --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU bash/ {print $4}' )"
if [[ -n $( type -p gawk ) ]];then if [[ -n $( type -p gawk ) ]];then
echo "Gawk version: $( gawk --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU Awk/ {print $3}' )" gawk_version=$( gawk --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU Awk/ {print $3}' )
fi fi
if [[ -n $( type -p sed ) ]];then if [[ -n $( type -p sed ) ]];then
echo "Sed version: $( sed --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU sed version/ {print $4}' )" sed_version=$( sed --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU sed version/ {print $4}' )
fi fi
if [[ -n $( type -p sudo ) ]];then if [[ -n $( type -p sudo ) ]];then
echo "Sudo version: $( sudo -V 2>&1 | awk 'BEGIN {IGNORECASE=1} /^Sudo version/ {print $3}' )" sudo_version=$( sudo -V 2>&1 | awk 'BEGIN {IGNORECASE=1} /^Sudo version/ {print $3}' )
fi fi
if [[ -n $( type -p python ) ]];then
python_version=$( python --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^Python/ {print $2}' )
fi
echo "Gawk version: $gawk_version"
echo "Sed version: $sed_version"
echo "Sudo version: $sudo_version"
echo "Python version: $python_version"
echo $Line echo $Line
echo "Test One: Required System Directories." echo "Test One: Required System Directories."
echo "If one of these system directories is missing, $SCRIPT_NAME cannot operate:" echo "If one of these system directories is missing, $SCRIPT_NAME cannot operate:"