diff --git a/inxi b/inxi index 7efa8ce..efb0de9 100755 --- a/inxi +++ b/inxi @@ -1,8 +1,8 @@ #!/usr/bin/env bash ######################################################################## #### Script Name: inxi -#### Version: 2.1.10 -#### Date: 2014-03-25 +#### Version: 2.1.11 +#### Date: 2014-03-26 #### Patch Number: 00 ######################################################################## #### SPECIAL THANKS @@ -797,10 +797,6 @@ main() # then create the output print_it_out - ## last steps - if [[ $B_IRC == 'false' && $SCHEME -gt 0 ]];then - echo -n "" - fi eval $LOGFE # weechat's executor plugin forced me to do this, and rightfully so, because else the exit code # from the last command is taken.. @@ -822,9 +818,9 @@ initialize_data() BSD_VERSION=$( uname -s 2>/dev/null | tr '[A-Z]' '[a-z]' ) # note: archbsd says they are a freebsd distro, so assuming it's the same as freebsd - if [[ -n $( grep 'bsd' <<< "$BSD_VERSION" ) ]];then + if [[ -z ${BSD_VERSION/*bsd*/} ]];then # GNU/kfreebsd will by definition have GNU tools like sed/grep - if [[ -n $( grep 'kfreebsd' <<< "$BSD_VERSION" ) ]];then + if [[ -z ${BSD_VERSION/*kfreebsd*/} ]];then BSD_TYPE='debian-bsd' # debian gnu bsd else BSD_TYPE='bsd' # all other bsds @@ -1106,6 +1102,11 @@ set_color_scheme() C2="${!a_output_colors[1]}" CN="${!a_output_colors[2]}" # ((COLOR_SCHEME++)) ## note: why is this? ## + # handle some explicit colors that are used for no color 0 + if [[ $SCHEME -eq 0 ]];then + NORMAL='' + RED='' + fi eval $LOGFE } @@ -9028,6 +9029,11 @@ print_it_out() print_info_data fi fi + ## last steps, clear any lingering colors + if [[ $B_IRC == 'false' && $SCHEME -gt 0 ]];then + echo -n "" + fi + eval $LOGFE } @@ -9162,7 +9168,7 @@ print_audio_data() else alsa_version='N/A' fi - alsa_data="${C1}Sound$SEP3${C2} $alsa ${C1}v:$SEP3${C2} $alsa_version" + alsa_data="${C1}Sound$SEP3${C2} $alsa ${C1}v$SEP3${C2} $alsa_version" IFS="$ORIGINAL_IFS" fi # note, error handling is done in the get function, so this will never be null, but diff --git a/inxi.changelog b/inxi.changelog index 0a83628..a64ef03 100755 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,17 @@ +===================================================================================== +Version: 2.1.11 +Patch Version: 00 +Script Date: 2014-03-26 +----------------------------------- +Changes: +----------------------------------- +New version: fixed an old bug, with -c 0, no colors, RED and NORMAL color codes were +not set to null, which results in some cases with red output, along with turning +terminal/console font color red. + +----------------------------------- +-- Harald Hope - Wed, 26 Mar 2014 12:44:53 -0700 + ===================================================================================== Version: 2.1.10 Patch Version: 00