From 53f3a4e74f9558b124fe1b7ef0d3ad558c1ed5b4 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Sat, 11 Jun 2011 05:55:44 +0000 Subject: [PATCH] version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think. --- inxi | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/inxi b/inxi index c3927bf..900d0d5 100755 --- a/inxi +++ b/inxi @@ -1,9 +1,9 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 1.6.6 +#### version: 1.6.7 #### Date: June 10 2011 -#### Patch Number: 05 +#### Patch Number: 00 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -1437,26 +1437,35 @@ check_recommends() echo "$SCRIPT_NAME will now begin checking for the programs it needs to operate." echo $Line - echo 'Test One: Script Dependencies and Required System Directories.' - echo $Line - echo "You are running 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 + echo "Gawk version: $( gawk --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU Awk/ {print $3}' )" + fi + if [[ -n $( type -p sudo ) ]];then + echo "Sudo version: $( sudo -V 2>&1 | awk 'BEGIN {IGNORECASE=1} /^Sudo version/ {print $3}' )" + fi echo $Line + echo "Test One: Required System Directories." + echo "If one of these system directories is missing, $SCRIPT_NAME cannot operate:" + echo check_recommends_items 'required-dirs' - echo "If one of these applications is missing, $SCRIPT_NAME cannot operate." - echo $Line + echo "Test Two: Required Core Applications." + echo "If one of these applications is missing, $SCRIPT_NAME cannot operate:" + echo check_recommends_items 'required-apps' - echo 'Test Two: Script Recommends for Graphics features. If you do not use X these do not matter.' - echo "If one of these applications is missing, $SCRIPT_NAME will have incomplete output." - echo $Line + echo 'Test Three: Script Recommends for Graphics Features. If you do not use X these do not matter.' + echo "If one of these applications is missing, $SCRIPT_NAME will have incomplete output:" + echo check_recommends_items 'recommended-x-apps' - echo 'Test Three: Script Recommends for remaining features.' - echo "If one of these applications is missing, $SCRIPT_NAME will have incomplete output." - echo $Line + echo 'Test Four: Script Recommends for Remaining Features.' + echo "If one of these applications is missing, $SCRIPT_NAME will have incomplete output:" + echo check_recommends_items 'recommended-apps' - echo 'Test Four: System directories for various information.' - echo "If one of these directories is missing, $SCRIPT_NAME will have incomplete output." - echo $Line + echo 'Test Five: System Directories for Various Information.' + echo "If one of these directories is missing, $SCRIPT_NAME will have incomplete output:" + echo check_recommends_items 'system-dirs' + echo 'All tests completed.' } # args: $1 - check item check_recommends_items() @@ -1592,7 +1601,8 @@ check_recommends_items() do application=$( cut -d ':' -f 1 <<< $item ) if [[ $type == 'applications' ]];then - echo '--------------------------------------------------------' + # echo '--------------------------------------------------------' + echo package=$( cut -d ':' -f 2 <<< $item ) package_deb=$( cut -d '~' -f 1 <<< $package ) package_pacman=$( cut -d '~' -f 2 <<< $package )