From fa9051f483c16003f5d5e54882429c1655fada2b Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Mon, 24 Mar 2014 23:02:23 +0000 Subject: [PATCH] branch one, another try --- inxi | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/inxi b/inxi index 90e0b53..417e4fa 100755 --- a/inxi +++ b/inxi @@ -2,8 +2,8 @@ ######################################################################## #### Script Name: inxi #### Version: 2.1.8 -#### Date: 2014-03-24 -#### Patch Number: 03-b2 +#### Date: 2014-04-24 +#### Patch Number: 01-b2 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -9606,17 +9606,17 @@ print_graphics_data() card_id="-$(($i+1))" fi - part_1_data="${C1}Card$card_id$SEP3${C2} $card_data " + part_1_data="${C1}Card$card_id$SEP3${C2} $card_data" part_2_data="$card_bus_id$chip_id" if [[ ${#A_GRAPHICS_CARD_DATA[@]} -gt 1 ]];then - if [[ $( calculate_line_length "$part_1_data$part_2_data" ) -gt $COLS_INNER ]];then + if [[ $( calculate_line_length "$part_1_data $part_2_data" ) -gt $COLS_INNER ]];then graphics_data=$( create_print_line "$line_starter" "$part_1_data" ) print_screen_output "$graphics_data" part_1_data='' line_starter=' ' fi - graphics_data=$( create_print_line "$line_starter" "$part_1_data$part_2_data" ) + graphics_data=$( create_print_line "$line_starter" "$part_1_data $part_2_data" ) print_screen_output "$graphics_data" part_1_data='' part_2_data='' @@ -9628,10 +9628,9 @@ print_graphics_data() else part_1_data="${C1}Card$SEP3${C2} Failed to Detect Video Card! " fi - graphics_data="$part_1_data$part_2_data" - # + # Print cards if not dual card system if [[ -n ${graphics_data% } ]];then - if [[ $( calculate_line_length "$graphics_data" ) -gt $COLS_INNER ]];then + if [[ $( calculate_line_length "$part_1_data $part_2_data" ) -gt $COLS_INNER ]];then graphics_data=$( create_print_line "$line_starter" "$part_1_data" ) print_screen_output "$graphics_data" part_1_data=''