mirror of
https://github.com/smxi/inxi.git
synced 2024-11-17 00:31:19 +00:00
branch one, G tests
This commit is contained in:
parent
75b67c8fa5
commit
f2731fac45
16
inxi
16
inxi
|
@ -3,7 +3,7 @@
|
||||||
#### Script Name: inxi
|
#### Script Name: inxi
|
||||||
#### Version: 2.1.8
|
#### Version: 2.1.8
|
||||||
#### Date: 2014-03-24
|
#### Date: 2014-03-24
|
||||||
#### Patch Number: 05-b2
|
#### Patch Number: 06-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=''
|
||||||
|
@ -9630,14 +9630,14 @@ print_graphics_data()
|
||||||
fi
|
fi
|
||||||
# Print cards if not dual card system
|
# Print cards if not dual card system
|
||||||
if [[ -n $part_1_data$part_2_data ]];then
|
if [[ -n $part_1_data$part_2_data ]];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=' '
|
||||||
echo 1
|
echo 1
|
||||||
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"
|
||||||
echo 2
|
echo 2
|
||||||
fi
|
fi
|
||||||
|
@ -9688,11 +9688,11 @@ print_graphics_data()
|
||||||
print_screen_output "$graphics_data"
|
print_screen_output "$graphics_data"
|
||||||
part_1_data=''
|
part_1_data=''
|
||||||
line_starter=' '
|
line_starter=' '
|
||||||
#echo 1
|
echo 5
|
||||||
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"
|
||||||
#echo 2
|
echo 6
|
||||||
fi
|
fi
|
||||||
eval $LOGFE
|
eval $LOGFE
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue