Small patch, no new version, new tarball. Fixed issue # 124 --recommends failed to

show sed/perl version: the first was due to a syntax change in --version for sed,
the second was a typo in inxi.
This commit is contained in:
Harald Hope 2017-09-20 10:13:59 -07:00
parent 911ac1685c
commit bb5681d5f6
2 changed files with 19 additions and 4 deletions

9
inxi
View file

@ -3,7 +3,7 @@
SELF_NAME='inxi'
# don't quote the following, parsers grab these too
SELF_VERSION=2.3.39
SELF_DATE=2017-09-12
SELF_DATE=2017-09-20
SELF_PATCH=00
########################################################################
#### SPECIAL THANKS
@ -2504,10 +2504,11 @@ check_recommends_user_output()
gawk_version=$( gawk --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU Awk/ {print $3}' )
fi
if type -p sed &>/dev/null;then
sed_version=$( sed --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU sed version/ {print $4}' )
# sed (GNU sed) 4.4 OR GNU sed version 4.4
sed_version=$( sed --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^(GNU sed version|sed)/ {print $4;exit}' )
if [[ -z $sed_version ]];then
# note: bsd sed shows error with --version flag
sed_version=$( sed --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^sed: illegal option/ {print "BSD sed"}' )
sed_version=$( sed --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^sed: illegal option/ {print "BSD sed";exit}' )
fi
fi
if type -p sudo &>/dev/null;then
@ -2524,7 +2525,7 @@ check_recommends_user_output()
echo "Sed version: $sed_version"
echo "Sudo version: $sudo_version"
echo "Python version: $python_version (deprecated)"
echo "Perl version: $perl_versio"
echo "Perl version: $perl_version"
echo $Line
echo "Test One: Required System Directories (Linux Only)."

View file

@ -1,3 +1,17 @@
=====================================================================================
Version: 2.3.39
Patch Version: 00
Script Date: 2017-09-20
-----------------------------------
Changes:
-----------------------------------
Small patch, no new version, new tarball. Fixed issue # 124 --recommends failed to
show sed/perl version: the first was due to a syntax change in --version for sed,
the second was a typo in inxi.
-----------------------------------
-- Harald Hope - Wed, 20 Sep 2017 10:11:46 -0700
=====================================================================================
Version: 2.3.39
Patch Version: 00