dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2025-01-19 08:57:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

try two on branch 1

Browse source
This commit is contained in:
inxi-svn 2014-03-24 22:46:00 +00:00
parent 7f6a12b67c
commit ecb6bad821
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
inxi
View file

@ -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: 01-b1 #### Patch Number: 02-b1
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -2086,7 +2086,7 @@ print_screen_output()
create_print_line() create_print_line()
{ {
eval $LOGFS 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" printf "${C1}%-${INDENT}s${C2} %s" "$1" "$line"
eval $LOGFE eval $LOGFE
} }
@ -9629,7 +9629,8 @@ 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
graphics_data="$part_1_data$part_2_data" 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 if [[ $( 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"
@ -9646,13 +9647,13 @@ print_graphics_data()
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" 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" ) graphics_data=$( create_print_line "$line_starter" "$part_1_data" )
print_screen_output "$graphics_data" print_screen_output "$graphics_data"
line_starter=' ' line_starter=' '
graphics_data=$part_2_data graphics_data=$part_2_data
fi fi
if [[ -n $graphics_data ]];then if [[ -n ${graphics_data%% } ]];then
graphics_data=$( create_print_line "$line_starter" "$graphics_data${CN}" ) graphics_data=$( create_print_line "$line_starter" "$graphics_data${CN}" )
print_screen_output "$graphics_data" print_screen_output "$graphics_data"
line_starter=' ' line_starter=' '