From d12c42e3cf6556da53cd0fb7db9f34271004a36e Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Tue, 25 Mar 2014 19:51:07 +0000 Subject: [PATCH] branch one test, supybot etc --- inxi | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/inxi b/inxi index 32edd75..a3799b6 100755 --- a/inxi +++ b/inxi @@ -3,7 +3,7 @@ #### Script Name: inxi #### Version: 2.1.9 #### Date: 2014-03-24 -#### Patch Number: 01-b1 +#### Patch Number: 02-b1 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -3222,24 +3222,25 @@ set_perl_python_client_data() IRC_CLIENT='Konversation' version=$( get_de_app_version 'konversation' '^konversation' '2' ) B_CONSOLE_IRC='false' - elif [[ $B_RUNNING_IN_DISPLAY == 'false' && \ - -n $( grep -Ei 'gribble|limnoria|supybot' <<< "$Ps_aux_Data" ) ]];then - if [[ -z ${Ps_aux_Data/*gribble*/} ]];then - IRC_CLIENT='Gribble' - elif [[ -z ${Ps_aux_Data/*limnoria*/} ]];then - IRC_CLIENT='Limnoria' - elif [[ -z ${Ps_aux_Data/*supybot*/} ]];then + elif [[ $B_RUNNING_IN_DISPLAY == 'false' && -z ${Ps_aux_Data/*supybot*/} ]];then + version=$( get_de_app_version 'supybot' '^Supybot' '2' ) + if [[ -n $version ]];then + IRC_CLIENT_VERSION=" $version" + if [[ -z ${version/*gribble*/} ]];then + IRC_CLIENT='Gribble' + elif [[ -z ${version/*limnoria*/} ]];then + IRC_CLIENT='Limnoria' + else + IRC_CLIENT='Supybot' + fi + else IRC_CLIENT='Supybot' - fi # currently all use the same actual app name, this will probably change. - if [[ -n $IRC_CLIENT ]];then - version=$( get_de_app_version 'supybot' '^Supybot' '2' ) fi B_CONSOLE_IRC='true' else IRC_CLIENT="Unknown $1 client" fi - if [[ -n $version ]];then IRC_CLIENT_VERSION=" $version" fi