mirror of
https://github.com/smxi/inxi.git
synced 2025-01-19 00:47:47 +00:00
try two on branch 1
This commit is contained in:
parent
7f6a12b67c
commit
ecb6bad821
11
inxi
11
inxi
|
@ -3,7 +3,7 @@
|
|||
#### Script Name: inxi
|
||||
#### Version: 2.1.8
|
||||
#### Date: 2014-03-24
|
||||
#### Patch Number: 01-b1
|
||||
#### Patch Number: 02-b1
|
||||
########################################################################
|
||||
#### SPECIAL THANKS
|
||||
########################################################################
|
||||
|
@ -2086,7 +2086,7 @@ print_screen_output()
|
|||
create_print_line()
|
||||
{
|
||||
eval $LOGFS
|
||||
local line=$2
|
||||
local line=${2% } #trim off trailing space if present, note: ${CN} may hide the actual trailing end space
|
||||
printf "${C1}%-${INDENT}s${C2} %s" "$1" "$line"
|
||||
eval $LOGFE
|
||||
}
|
||||
|
@ -9629,7 +9629,8 @@ print_graphics_data()
|
|||
part_1_data="${C1}Card$SEP3${C2} Failed to Detect Video Card! "
|
||||
fi
|
||||
graphics_data="$part_1_data$part_2_data"
|
||||
if [[ -n $graphics_data ]];then
|
||||
# remove all white spaces from line
|
||||
if [[ -n ${graphics_data%% } ]];then
|
||||
if [[ $( calculate_line_length "$graphics_data" ) -gt $COLS_INNER ]];then
|
||||
graphics_data=$( create_print_line "$line_starter" "$part_1_data" )
|
||||
print_screen_output "$graphics_data"
|
||||
|
@ -9646,13 +9647,13 @@ print_graphics_data()
|
|||
part_2_data="${C1}$res_tty$SEP3${C2} $screen_resolution $root_x_string"
|
||||
|
||||
graphics_data="$part_1_data$part_2_data"
|
||||
if [[ -n $graphics_data && $( calculate_line_length "$graphics_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" )
|
||||
print_screen_output "$graphics_data"
|
||||
line_starter=' '
|
||||
graphics_data=$part_2_data
|
||||
fi
|
||||
if [[ -n $graphics_data ]];then
|
||||
if [[ -n ${graphics_data%% } ]];then
|
||||
graphics_data=$( create_print_line "$line_starter" "$graphics_data${CN}" )
|
||||
print_screen_output "$graphics_data"
|
||||
line_starter=' '
|
||||
|
|
Loading…
Reference in a new issue