dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-17 00:31:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

last cleanups and syntax fixes

Browse source
This commit is contained in:
inxi-svn 2009-01-26 22:35:34 +00:00
parent e8a2c34658
commit 804ec79ce5
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 0.9.7-b1-t1 #### version: 0.9.7-b1-t2
#### Date: 26 January 2009 #### Date: 26 January 2009
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -1789,6 +1789,7 @@ get_graphics_glx_data()
if [[ $B_X_RUNNING == 'true' ]];then if [[ $B_X_RUNNING == 'true' ]];then
IFS=$'\n' IFS=$'\n'
A_GLX_DATA=( $( glxinfo | gawk -F ': ' ' A_GLX_DATA=( $( glxinfo | gawk -F ': ' '
# note: function declarations go before BEGIN? It appears so, confirm.
function join(arr, sep) { function join(arr, sep) {
s="" s=""
i=flag=0 i=flag=0
@ -1801,7 +1802,9 @@ get_graphics_glx_data()
return s return s
} }
BEGIN { IGNORECASE=1 } BEGIN {
IGNORECASE=1
}
/opengl renderer/ { /opengl renderer/ {
if ($2 ~ /mesa/) { if ($2 ~ /mesa/) {
# Allow r300 et al, but not the rest # Allow r300 et al, but not the rest
@ -1839,7 +1842,9 @@ get_graphics_res_data()
# Added the two ?'s , because the resolution is now reported without spaces around the 'x', as in # Added the two ?'s , because the resolution is now reported without spaces around the 'x', as in
# 1400x1050 instead of 1400 x 1050. Change as of X.org version 1.3.0 # 1400x1050 instead of 1400 x 1050. Change as of X.org version 1.3.0
screen_resolution=$( xrandr | gawk ' screen_resolution=$( xrandr | gawk '
/\*/ { res[++m] = gensub(/^.* ([0-9]+) ?x ?([0-9]+)[_ ].* ([0-9\.]+)\*.*$/,"\\1x\\2@\\3hz","g",$0) } /\*/ {
res[++m] = gensub(/^.* ([0-9]+) ?x ?([0-9]+)[_ ].* ([0-9\.]+)\*.*$/,"\\1x\\2@\\3hz","g",$0)
}
END { END {
for (n in res) { for (n in res) {
if (res[n] ~ /^[[:digit:]]+x[[:digit:]]+/) { if (res[n] ~ /^[[:digit:]]+x[[:digit:]]+/) {
@ -1884,7 +1889,9 @@ get_graphics_x_data()
if [[ $B_X_RUNNING == 'true' ]];then if [[ $B_X_RUNNING == 'true' ]];then
# X vendor and version detection. # X vendor and version detection.
x_vendor=$( xdpyinfo | gawk -F': +' ' x_vendor=$( xdpyinfo | gawk -F': +' '
BEGIN { IGNORECASE=1 } BEGIN {
IGNORECASE=1
}
/vendor string/ { /vendor string/ {
gsub(/the|inc|foundation|project|corporation/, "", $2) gsub(/the|inc|foundation|project|corporation/, "", $2)
gsub(/,/, " ", $2) gsub(/,/, " ", $2)
@ -1899,7 +1906,9 @@ get_graphics_x_data()
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 { IGNORECASE=1 } BEGIN {
IGNORECASE=1
}
/vendor release number/ { /vendor release number/ {
gsub(/0+$/, "", $2) gsub(/0+$/, "", $2)
gsub(/0+/, ".", $2) gsub(/0+/, ".", $2)