mirror of
https://github.com/smxi/inxi.git
synced 2025-01-31 18:12:21 +00:00
New version, new tarball. Added lxqt desktop id that is not dependent on openbox detection.
Fixed some bugs. Added a pciconf class for audio. Added support for bsds running lspci, which lets openbsd show card info for -A,-G,-N
This commit is contained in:
parent
b50c4a156e
commit
0497f153cd
47
inxi
47
inxi
|
@ -3,8 +3,8 @@
|
||||||
# openbsd ftp does http
|
# openbsd ftp does http
|
||||||
########################################################################
|
########################################################################
|
||||||
#### Script Name: inxi
|
#### Script Name: inxi
|
||||||
#### Version: 2.2.7
|
#### Version: 2.2.8
|
||||||
#### Date: 2014-09-20
|
#### Date: 2014-09-21
|
||||||
#### Patch Number: 00
|
#### Patch Number: 00
|
||||||
########################################################################
|
########################################################################
|
||||||
#### SPECIAL THANKS
|
#### SPECIAL THANKS
|
||||||
|
@ -828,11 +828,11 @@ initialize_data()
|
||||||
initialize_paths
|
initialize_paths
|
||||||
|
|
||||||
# set downloaders.
|
# set downloaders.
|
||||||
if [[ -z $( type -p wget ) ]];then
|
if ! type -p wget &>/dev/null;then
|
||||||
# first check for bsd stuff
|
# first check for bsd stuff
|
||||||
if [[ -n $( type -p fetch ) ]];then
|
if type -p fetch &>/dev/null;then
|
||||||
DOWNLOADER='fetch'
|
DOWNLOADER='fetch'
|
||||||
elif -n $( type -p curl ) ]];then
|
elif type -p curl &>/dev/null;then
|
||||||
DOWNLOADER='curl'
|
DOWNLOADER='curl'
|
||||||
elif [[ $BSD_VERSION == 'openbsd' && -n $( type -p ftp ) ]];then
|
elif [[ $BSD_VERSION == 'openbsd' && -n $( type -p ftp ) ]];then
|
||||||
DOWNLOADER='ftp'
|
DOWNLOADER='ftp'
|
||||||
|
@ -3665,7 +3665,7 @@ get_audio_usb_data()
|
||||||
lsusb_data=$( lsusb 2>/dev/null )
|
lsusb_data=$( lsusb 2>/dev/null )
|
||||||
fi
|
fi
|
||||||
log_function_data 'raw' "usb_data:\n$lsusb_data"
|
log_function_data 'raw' "usb_data:\n$lsusb_data"
|
||||||
if [[ -n $lsusb_data ]];then
|
if [[ -n $lsusb_data && -d /proc/asound/ ]];then
|
||||||
# for every sound card symlink in /proc/asound - display information about it
|
# for every sound card symlink in /proc/asound - display information about it
|
||||||
for usb_proc_file in /proc/asound/*
|
for usb_proc_file in /proc/asound/*
|
||||||
do
|
do
|
||||||
|
@ -4411,6 +4411,22 @@ get_desktop_environment()
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
desktop_environment="Unity"
|
desktop_environment="Unity"
|
||||||
|
elif [[ $XDG_CURRENT_DESKTOP == 'LXQt' ]];then
|
||||||
|
# if type -p lxqt-about &>/dev/null;then
|
||||||
|
# version=$( get_program_version 'lxqt-about' '^lxqt-about' '2' )
|
||||||
|
# fi
|
||||||
|
if [[ $B_EXTRA_DATA == 'true' ]];then
|
||||||
|
if kded$KDE_SESSION_VERSION &>/dev/null;then
|
||||||
|
version_data=$( kded$KDE_SESSION_VERSION --version 2>/dev/null )
|
||||||
|
toolkit=$( grep -si '^Qt:' <<< "$version_data" | gawk '{print $2}' )
|
||||||
|
elif type -p qtdiag &>/dev/null;then
|
||||||
|
toolkit=$( get_program_version 'qtdiag' '^qt' '2' )
|
||||||
|
fi
|
||||||
|
if [[ -n $toolkit ]];then
|
||||||
|
version="$version (Qt $toolkit)"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
desktop_environment='LXQt'
|
||||||
fi
|
fi
|
||||||
# did we find it? If not, start the xprop tests
|
# did we find it? If not, start the xprop tests
|
||||||
if [[ -z $desktop_environment ]];then
|
if [[ -z $desktop_environment ]];then
|
||||||
|
@ -6810,8 +6826,10 @@ get_networking_data()
|
||||||
IFS="$ORIGINAL_IFS"
|
IFS="$ORIGINAL_IFS"
|
||||||
get_networking_usb_data
|
get_networking_usb_data
|
||||||
if [[ $B_SHOW_ADVANCED_NETWORK == 'true' || $B_USB_NETWORKING == 'true' ]];then
|
if [[ $B_SHOW_ADVANCED_NETWORK == 'true' || $B_USB_NETWORKING == 'true' ]];then
|
||||||
|
if [[ -z $BSD_TYPE ]];then
|
||||||
get_network_advanced_data
|
get_network_advanced_data
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
a_temp=${A_NETWORK_DATA[@]}
|
a_temp=${A_NETWORK_DATA[@]}
|
||||||
log_function_data "A_NETWORK_DATA: $a_temp"
|
log_function_data "A_NETWORK_DATA: $a_temp"
|
||||||
|
|
||||||
|
@ -8077,13 +8095,13 @@ EOF"
|
||||||
sub(/:$/, "", pciId)
|
sub(/:$/, "", pciId)
|
||||||
itemData=$4
|
itemData=$4
|
||||||
chipId=gensub(/.*chip=([0-9a-f][0-9a-f][0-9a-f][0-9a-f])([0-9a-f][0-9a-f][0-9a-f][0-9a-f]).*/, "\\2:\\1", itemData )
|
chipId=gensub(/.*chip=([0-9a-f][0-9a-f][0-9a-f][0-9a-f])([0-9a-f][0-9a-f][0-9a-f][0-9a-f]).*/, "\\2:\\1", itemData )
|
||||||
if ( $2 ~ /class=020000|class=0x068000/ ) {
|
if ( $2 ~ /class=020000|class=068000/ ) {
|
||||||
class="network"
|
class="network"
|
||||||
}
|
}
|
||||||
else if ( $2 == "class=030000" ) {
|
else if ( $2 == "class=030000" ) {
|
||||||
class="display"
|
class="display"
|
||||||
}
|
}
|
||||||
else if ( $2 == "class=040300" ) {
|
else if ( $2 ~ /class=040300|class=040100/ ) {
|
||||||
class="audio"
|
class="audio"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10711,10 +10729,14 @@ print_audio_data()
|
||||||
local driver=''
|
local driver=''
|
||||||
# set A_AUDIO_DATA and get alsa data
|
# set A_AUDIO_DATA and get alsa data
|
||||||
if [[ $BSD_TYPE == 'bsd' ]];then
|
if [[ $BSD_TYPE == 'bsd' ]];then
|
||||||
|
if [[ $B_PCICONF == 'true' ]];then
|
||||||
if [[ $B_PCICONF_SET == 'false' ]];then
|
if [[ $B_PCICONF_SET == 'false' ]];then
|
||||||
get_pciconf_data
|
get_pciconf_data
|
||||||
fi
|
fi
|
||||||
get_pciconf_card_data 'audio'
|
get_pciconf_card_data 'audio'
|
||||||
|
elif [[ $B_LSPCI == 'true' ]];then
|
||||||
|
get_audio_data
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
get_audio_data
|
get_audio_data
|
||||||
fi
|
fi
|
||||||
|
@ -11177,10 +11199,14 @@ print_graphics_data()
|
||||||
|
|
||||||
# set A_GRAPHICS_CARD_DATA
|
# set A_GRAPHICS_CARD_DATA
|
||||||
if [[ $BSD_TYPE == 'bsd' ]];then
|
if [[ $BSD_TYPE == 'bsd' ]];then
|
||||||
|
if [[ $B_PCICONF == 'true' ]];then
|
||||||
if [[ $B_PCICONF_SET == 'false' ]];then
|
if [[ $B_PCICONF_SET == 'false' ]];then
|
||||||
get_pciconf_data
|
get_pciconf_data
|
||||||
fi
|
fi
|
||||||
get_pciconf_card_data 'display'
|
get_pciconf_card_data 'display'
|
||||||
|
elif [[ $B_LSPCI == 'true' ]];then
|
||||||
|
get_graphics_card_data
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
get_graphics_card_data
|
get_graphics_card_data
|
||||||
fi
|
fi
|
||||||
|
@ -11872,12 +11898,17 @@ print_networking_data()
|
||||||
local card_string='' port_plural='' module_version='' pci_bus_id='' bus_usb_text=''
|
local card_string='' port_plural='' module_version='' pci_bus_id='' bus_usb_text=''
|
||||||
local bus_usb_id='' line_starter='Network:' card_string='' card_data='' chip_id=''
|
local bus_usb_id='' line_starter='Network:' card_string='' card_data='' chip_id=''
|
||||||
local driver='' part_2_data=''
|
local driver='' part_2_data=''
|
||||||
|
|
||||||
# set A_NETWORK_DATA
|
# set A_NETWORK_DATA
|
||||||
if [[ $BSD_TYPE == 'bsd' ]];then
|
if [[ $BSD_TYPE == 'bsd' ]];then
|
||||||
|
if [[ $B_PCICONF == 'true' ]];then
|
||||||
if [[ $B_PCICONF_SET == 'false' ]];then
|
if [[ $B_PCICONF_SET == 'false' ]];then
|
||||||
get_pciconf_data
|
get_pciconf_data
|
||||||
fi
|
fi
|
||||||
get_pciconf_card_data 'network'
|
get_pciconf_card_data 'network'
|
||||||
|
elif [[ $B_LSPCI == 'true' ]];then
|
||||||
|
get_networking_data
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
get_networking_data
|
get_networking_data
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,3 +1,18 @@
|
||||||
|
=====================================================================================
|
||||||
|
Version: 2.2.8
|
||||||
|
Patch Version: 00
|
||||||
|
Script Date: 2014-09-21
|
||||||
|
-----------------------------------
|
||||||
|
Changes:
|
||||||
|
-----------------------------------
|
||||||
|
New version, new tarball. Added lxqt desktop id that is not dependent on openbox detection.
|
||||||
|
|
||||||
|
Fixed some bugs. Added a pciconf class for audio. Added support for bsds running lspci, which
|
||||||
|
lets openbsd show card info for -A,-G,-N
|
||||||
|
|
||||||
|
-----------------------------------
|
||||||
|
-- Harald Hope - Sun, 21 Sep 2014 17:37:23 -0700
|
||||||
|
|
||||||
=====================================================================================
|
=====================================================================================
|
||||||
Version: 2.2.7
|
Version: 2.2.7
|
||||||
Patch Version: 00
|
Patch Version: 00
|
||||||
|
|
Loading…
Reference in a new issue