branch one, more G tests

This commit is contained in:
inxi-svn 2014-03-24 23:15:47 +00:00
parent fa9051f483
commit 75b67c8fa5

16
inxi
View file

@ -2,8 +2,8 @@
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### Version: 2.1.8 #### Version: 2.1.8
#### Date: 2014-04-24 #### Date: 2014-03-24
#### Patch Number: 01-b2 #### Patch Number: 05-b2
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -9629,7 +9629,7 @@ print_graphics_data()
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
# Print cards if not dual card system # Print cards if not dual card system
if [[ -n ${graphics_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"
@ -9637,7 +9637,7 @@ print_graphics_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
@ -9647,16 +9647,16 @@ print_graphics_data()
part_1_data="$display_server_string$driver_string" part_1_data="$display_server_string$driver_string"
part_2_data="${C1}$res_tty$SEP3${C2} $screen_resolution $root_x_string" part_2_data="${C1}$res_tty$SEP3${C2} $screen_resolution $root_x_string"
graphics_data="$part_1_data$part_2_data" if [[ -n $part_1_data$part_2_data && $( calculate_line_length "$part_1_data $part_2_data" ) -gt $COLS_INNER ]];then
if [[ -n ${graphics_data%% } && $( calculate_line_length "$graphics_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"
line_starter=' ' line_starter=' '
part_1_data=''
graphics_data=$part_2_data graphics_data=$part_2_data
echo 3 echo 3
fi fi
if [[ -n ${graphics_data%% } ]];then if [[ -n $part_1_data$part_2_data ]];then
graphics_data=$( create_print_line "$line_starter" "$graphics_data${CN}" ) graphics_data=$( create_print_line "$line_starter" "$part_1_data$part_2_data" )
print_screen_output "$graphics_data" print_screen_output "$graphics_data"
line_starter=' ' line_starter=' '
echo 4 echo 4