branch one, another try

This commit is contained in:
inxi-svn 2014-03-24 23:02:23 +00:00
parent dc212c8a06
commit fa9051f483

15
inxi
View file

@ -2,8 +2,8 @@
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### Version: 2.1.8 #### Version: 2.1.8
#### Date: 2014-03-24 #### Date: 2014-04-24
#### Patch Number: 03-b2 #### Patch Number: 01-b2
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -9606,17 +9606,17 @@ print_graphics_data()
card_id="-$(($i+1))" card_id="-$(($i+1))"
fi 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" part_2_data="$card_bus_id$chip_id"
if [[ ${#A_GRAPHICS_CARD_DATA[@]} -gt 1 ]];then 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" ) graphics_data=$( create_print_line "$line_starter" "$part_1_data" )
print_screen_output "$graphics_data" print_screen_output "$graphics_data"
part_1_data='' part_1_data=''
line_starter=' ' line_starter=' '
fi 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" print_screen_output "$graphics_data"
part_1_data='' part_1_data=''
part_2_data='' part_2_data=''
@ -9628,10 +9628,9 @@ print_graphics_data()
else else
part_1_data="${C1}Card$SEP3${C2} Failed to Detect Video Card! " part_1_data="${C1}Card$SEP3${C2} Failed to Detect Video Card! "
fi fi
graphics_data="$part_1_data$part_2_data" # Print cards if not dual card system
#
if [[ -n ${graphics_data% } ]];then 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" ) graphics_data=$( create_print_line "$line_starter" "$part_1_data" )
print_screen_output "$graphics_data" print_screen_output "$graphics_data"
part_1_data='' part_1_data=''