mirror of
https://github.com/smxi/inxi.git
synced 2025-01-19 17:07:49 +00:00
(no version change)
Some code clean up, got rid of a few more awk one liners, and added back in the local variable.
This commit is contained in:
parent
ef7a785e32
commit
3bfc7ec9cb
10
inxi
10
inxi
|
@ -1982,7 +1982,9 @@ get_graphics_res_data()
|
||||||
}' )
|
}' )
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
screen_resolution=$( stty -F $( readlink /proc/$PPID/fd/0 ) size | gawk '{print $2"x"$1}' )
|
screen_resolution=$( stty -F $( readlink /proc/$PPID/fd/0 ) size | gawk '{
|
||||||
|
print $2"x"$1
|
||||||
|
}' )
|
||||||
fi
|
fi
|
||||||
echo "$screen_resolution"
|
echo "$screen_resolution"
|
||||||
}
|
}
|
||||||
|
@ -2023,7 +2025,9 @@ get_graphics_x_data()
|
||||||
# new method added since radeon and X.org and the disappearance of <X server name> version : ...etc
|
# new method added since radeon and X.org and the disappearance of <X server name> version : ...etc
|
||||||
# Later on, the normal textual version string returned, e.g. like: X.Org version: 6.8.2
|
# Later on, the normal textual version string returned, e.g. like: X.Org version: 6.8.2
|
||||||
# A failover mechanism is in place. (if $x_version is empty, the release number is parsed instead)
|
# A failover mechanism is in place. (if $x_version is empty, the release number is parsed instead)
|
||||||
x_version=$( xdpyinfo | gawk '/version:/ { print $NF }' )
|
x_version=$( xdpyinfo | gawk '/version:/ {
|
||||||
|
print $NF
|
||||||
|
}' )
|
||||||
if [[ -z $x_version ]];then
|
if [[ -z $x_version ]];then
|
||||||
x_version=$(xdpyinfo | gawk -F': +' '
|
x_version=$(xdpyinfo | gawk -F': +' '
|
||||||
BEGIN {
|
BEGIN {
|
||||||
|
@ -3066,7 +3070,7 @@ print_gfx_data()
|
||||||
{
|
{
|
||||||
local gfx_data='' i='' card_one='Card ' root_alert=''
|
local gfx_data='' i='' card_one='Card ' root_alert=''
|
||||||
local screen_resolution="$( get_graphics_res_data )"
|
local screen_resolution="$( get_graphics_res_data )"
|
||||||
local b_is_mesa='false'
|
local b_is_mesa='false' display_full_string=''
|
||||||
# set A_GFX_CARD_DATA
|
# set A_GFX_CARD_DATA
|
||||||
get_graphics_card_data
|
get_graphics_card_data
|
||||||
# set A_X_DATA
|
# set A_X_DATA
|
||||||
|
|
Loading…
Reference in a new issue