mirror of
https://github.com/smxi/inxi.git
synced 2025-01-19 08:57:57 +00:00
branches one, G tests
This commit is contained in:
parent
f2731fac45
commit
6a00502840
29
inxi
29
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: 06-b2
|
#### Patch Number: 07-b2
|
||||||
########################################################################
|
########################################################################
|
||||||
#### SPECIAL THANKS
|
#### SPECIAL THANKS
|
||||||
########################################################################
|
########################################################################
|
||||||
|
@ -9616,8 +9616,10 @@ print_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" )
|
if [[ -n $( grep -vE '^[[:space:]]*$' <<< $part_1_data$part_2_data ) ]];then
|
||||||
print_screen_output "$graphics_data"
|
graphics_data=$( create_print_line "$line_starter" "$part_1_data$part_2_data" )
|
||||||
|
print_screen_output "$graphics_data"
|
||||||
|
fi
|
||||||
part_1_data=''
|
part_1_data=''
|
||||||
part_2_data=''
|
part_2_data=''
|
||||||
line_starter=' '
|
line_starter=' '
|
||||||
|
@ -9637,9 +9639,11 @@ 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" )
|
if [[ -n $( grep -vE '^[[:space:]]*$' <<< $part_1_data$part_2_data ) ]];then
|
||||||
print_screen_output "$graphics_data"
|
graphics_data=$( create_print_line "$line_starter" "$part_1_data$part_2_data" )
|
||||||
echo 2
|
print_screen_output "$graphics_data"
|
||||||
|
echo 2
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
line_starter=' '
|
line_starter=' '
|
||||||
graphics_data=''
|
graphics_data=''
|
||||||
|
@ -9647,7 +9651,8 @@ 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"
|
||||||
|
|
||||||
if [[ -n $part_1_data$part_2_data && $( calculate_line_length "$part_1_data $part_2_data" ) -gt $COLS_INNER ]];then
|
if [[ -n $( grep -vE '^[[:space:]]*$' <<< $part_1_data$part_2_data ) && \
|
||||||
|
$( 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"
|
||||||
line_starter=' '
|
line_starter=' '
|
||||||
|
@ -9655,7 +9660,7 @@ print_graphics_data()
|
||||||
graphics_data=$part_2_data
|
graphics_data=$part_2_data
|
||||||
echo 3
|
echo 3
|
||||||
fi
|
fi
|
||||||
if [[ -n $part_1_data$part_2_data ]];then
|
if [[ -n $( grep -vE '^[[:space:]]*$' <<< $part_1_data$part_2_data ) ]];then
|
||||||
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"
|
||||||
line_starter=' '
|
line_starter=' '
|
||||||
|
@ -9690,9 +9695,11 @@ print_graphics_data()
|
||||||
line_starter=' '
|
line_starter=' '
|
||||||
echo 5
|
echo 5
|
||||||
fi
|
fi
|
||||||
graphics_data=$( create_print_line "$line_starter" "$part_1_data$part_2_data" )
|
if [[ -n $part_1_data$part_2_data ]];then
|
||||||
print_screen_output "$graphics_data"
|
graphics_data=$( create_print_line "$line_starter" "$part_1_data$part_2_data" )
|
||||||
echo 6
|
print_screen_output "$graphics_data"
|
||||||
|
echo 6
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
eval $LOGFE
|
eval $LOGFE
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue