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

New version, new tarball. This closes two issues:

Browse source 
1. Add amdgpu to possible xorg drivers list (and gpu sensors data)

2. switch to default dig command to get WAN ip. This is usually but not always faster than
the http method. Because the IP source is not truly trustworthy (run by cisco), I'm keeping a
fallback mode on 1 second time out failure of the previous http based methods. Added dig
to recommended tools list.
This commit is contained in:
Harald Hope 2016-02-21 11:32:57 -08:00
parent a3c8553fc7
commit b02dd68980
2 changed files with 67 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
inxi
View file

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### Version: 2.2.33 #### Version: 2.2.34
#### Date: 2016-01-30 #### Date: 2016-02-21
#### Patch Number: 00 #### Patch Number: 00
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -494,6 +494,7 @@ DEV_DISK_LABEL=''
DEV_DISK_MAPPER='' DEV_DISK_MAPPER=''
DEV_DISK_UUID='' DEV_DISK_UUID=''
DMIDECODE_DATA='' DMIDECODE_DATA=''
DNSTOOL=''
DOWNLOADER='wget' DOWNLOADER='wget'
IRC_CLIENT='' IRC_CLIENT=''
IRC_CLIENT_VERSION='' IRC_CLIENT_VERSION=''
@ -635,7 +636,7 @@ BAN_LIST_CPU='@||cpu |cpu deca|dual core|dual-core|tri core|tri-core|quad core|q
# this is for bash arrays AND avoiding * in arrays: ( fred * greg ) expands to the contents of the directory # this is for bash arrays AND avoiding * in arrays: ( fred * greg ) expands to the contents of the directory
BAN_LIST_ARRAY=',|\*' BAN_LIST_ARRAY=',|\*'
SENSORS_GPU_SEARCH='intel|radeon|nouveau' SENSORS_GPU_SEARCH='amdgpu|intel|radeon|nouveau'
### USB networking search string data, because some brands can have other products than ### USB networking search string data, because some brands can have other products than
### wifi/nic cards, they need further identifiers, with wildcards. ### wifi/nic cards, they need further identifiers, with wildcards.
@ -842,6 +843,10 @@ initialize_data()
initialize_paths initialize_paths
if type -p dig &>/dev/null;then
DNSTOOL='dig'
fi
# set downloaders. # set downloaders.
if ! type -p wget &>/dev/null;then if ! type -p wget &>/dev/null;then
# first check for bsd stuff # first check for bsd stuff
@ -2225,6 +2230,7 @@ check_recommends_items()
xrandr:x11-xserver-utils~xrandr~x11-server-utils~:-G_single_screen_resolution xrandr:x11-xserver-utils~xrandr~x11-server-utils~:-G_single_screen_resolution
' '
local recommended_apps=' local recommended_apps='
dig:dnsutils~dnsutils~bind-utils:-i_first_wlan_ip_default_test
dmidecode:dmidecode~dmidecode~dmidecode~:-M_if_no_sys_machine_data;_-m_memory dmidecode:dmidecode~dmidecode~dmidecode~:-M_if_no_sys_machine_data;_-m_memory
file:file~file~file~:-o_unmounted_file_system file:file~file~file~:-o_unmounted_file_system
hciconfig:bluez~bluez-utils~bluez-utils~:-n_-i_bluetooth_data hciconfig:bluez~bluez-utils~bluez-utils~:-n_-i_bluetooth_data
@ -5714,7 +5720,7 @@ get_graphics_driver()
eval $LOGFS eval $LOGFS
# list is from sgfxi plus non-free drivers # list is from sgfxi plus non-free drivers
local driver_list='apm|ark|ati|chips|cirrus|cyrix|fbdev|fglrx|glint|i128|i740|intel|i810|imstt|mach64|mga|neomagic|nsc|nvidia|nv|openchrome|nouveau|radeon|radeonhd|rendition|s3virge|s3|savage|siliconmotion|sisusb|sis|tdfx|tga|trident|tseng|unichrome|vboxvideo|vesa|vga|via|voodoo|vmware|v4l' local driver_list='amdgpu|apm|ark|ati|chips|cirrus|cyrix|fbdev|fglrx|glint|i128|i740|intel|i810|imstt|mach64|mga|neomagic|nsc|nvidia|nv|openchrome|nouveau|radeon|radeonhd|rendition|s3virge|s3|savage|siliconmotion|sisusb|sis|tdfx|tga|trident|tseng|unichrome|vboxvideo|vesa|vga|via|voodoo|vmware|v4l'
local driver='' driver_string='' xorg_log_data='' status='' a_temp='' local driver='' driver_string='' xorg_log_data='' status='' a_temp=''
if [[ $B_XORG_LOG == 'true' ]];then if [[ $B_XORG_LOG == 'true' ]];then
@ -7386,7 +7392,7 @@ get_networking_usb_data()
get_networking_wan_ip_data() get_networking_wan_ip_data()
{ {
eval $LOGFS eval $LOGFS
local ip='' ip_data='' downloader_error=0 ua='' local ip='' ip_data='' downloader_error=0 ua='' b_ipv4_good=true
# get ip using wget redirect to stdout. This is a clean, text only IP output url, # get ip using wget redirect to stdout. This is a clean, text only IP output url,
# single line only, ending in the ip address. May have to modify this in the future # single line only, ending in the ip address. May have to modify this in the future
@ -7394,6 +7400,13 @@ get_networking_wan_ip_data()
# awk has bad regex handling so checking it with grep -E instead # awk has bad regex handling so checking it with grep -E instead
# ip=$( echo 2001:0db8:85a3:0000:0000:8a2e:0370:7334 | gawk --re-interval ' # ip=$( echo 2001:0db8:85a3:0000:0000:8a2e:0370:7334 | gawk --re-interval '
# ip=$( wget -q -O - $WAN_IP_URL | gawk --re-interval ' # ip=$( wget -q -O - $WAN_IP_URL | gawk --re-interval '
# this generates a direct dns based ipv4 ip address, but if opendns.com goes down, the fall
# note: consistently slower than domain based: dig +short +time=1 +tries=1 myip.opendns.com. A @208.67.222.222
# backs will still work.
if [[ -n $DNSTOOL ]];then
ip=$( dig +short +time=1 +tries=1 myip.opendns.com @resolver1.opendns.com 2>/dev/null)
fi
if [[ $ip == '' ]];then
case $DOWNLOADER in case $DOWNLOADER in
curl) curl)
if [[ -n $( grep 'smxi.org' <<< $WAN_IP_URL ) ]];then if [[ -n $( grep 'smxi.org' <<< $WAN_IP_URL ) ]];then
@ -7422,6 +7435,8 @@ get_networking_wan_ip_data()
#gsub("\n","",$2") #gsub("\n","",$2")
print $NF print $NF
}' <<< "$ip_data" ) }' <<< "$ip_data" )
fi
# validate the data # validate the data
if [[ -z $ip ]];then if [[ -z $ip ]];then
ip='None Detected!' ip='None Detected!'

19
inxi.changelog
View file

@ -1,3 +1,22 @@
=====================================================================================
Version: 2.2.34
Patch Version: 00
Script Date: 2016-02-21
-----------------------------------
Changes:
-----------------------------------
New version, new tarball. This closes two issues:
1. Add amdgpu to possible xorg drivers list (and gpu sensors data)
2. switch to default dig command to get WAN ip. This is usually but not always faster than
the http method. Because the IP source is not truly trustworthy (run by cisco), I'm keeping a
fallback mode on 1 second time out failure of the previous http based methods. Added dig
to recommended tools list.
-----------------------------------
-- Harald Hope - Sun, 21 Feb 2016 11:18:54 -0800
===================================================================================== =====================================================================================
Version: 2.2.33 Version: 2.2.33
Patch Version: 00 Patch Version: 00