From bb5681d5f66b6b626c28f725cc6cfa524b8e7d4c Mon Sep 17 00:00:00 2001 From: Harald Hope Date: Wed, 20 Sep 2017 10:13:59 -0700 Subject: [PATCH] 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. --- inxi | 9 +++++---- inxi.changelog | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/inxi b/inxi index b6f1b6f..ed9e60c 100755 --- a/inxi +++ b/inxi @@ -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)." diff --git a/inxi.changelog b/inxi.changelog index 9a361ff..b92c02c 100644 --- a/inxi.changelog +++ b/inxi.changelog @@ -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