diff options
author | Unit 193 <unit193@ubuntu.com> | 2015-05-20 16:14:05 -0400 |
---|---|---|
committer | Unit 193 <unit193@ubuntu.com> | 2015-05-20 16:14:05 -0400 |
commit | b8f908878d9f473ee3b030228ba1487c6de02f9d (patch) | |
tree | 9c586aaf768dd7c743c6d3539706f87520ebaa3a /inxi | |
parent | 52ad6e5f318359be3fcdfa1405a8b8d4cad944e6 (diff) | |
download | inxi-b8f908878d9f473ee3b030228ba1487c6de02f9d.tar.bz2 inxi-b8f908878d9f473ee3b030228ba1487c6de02f9d.tar.xz inxi-b8f908878d9f473ee3b030228ba1487c6de02f9d.tar.zst |
Imported Upstream version 2.2.21upstream/2.2.21
Diffstat (limited to 'inxi')
-rwxr-xr-x | inxi | 79 |
1 files changed, 63 insertions, 16 deletions
@@ -1,8 +1,8 @@ #!/usr/bin/env bash ######################################################################## #### Script Name: inxi -#### Version: 2.2.19 -#### Date: 2015-02-15 +#### Version: 2.2.21 +#### Date: 2015-05-13 #### Patch Number: 00 ######################################################################## #### SPECIAL THANKS @@ -1903,13 +1903,48 @@ debug_data_collector() else touch $debug_data_dir/xorg-conf-d-files-absent fi - echo 'Collecting X, xprop, glxinfo, xrandr, xdpyinfo data...' - xprop -root &> $debug_data_dir/xprop_root.txt - glxinfo &> $debug_data_dir/glxinfo.txt - xdpyinfo &> $debug_data_dir/xdpyinfo.txt - xrandr &> $debug_data_dir/xrandr.txt - X -version &> $debug_data_dir/x-version.txt - Xorg -version &> $debug_data_dir/xorg-version.txt + echo 'Collecting X, xprop, glxinfo, xrandr, xdpyinfo data, wayland, weston...' + if type -p weston-info &>/dev/null; then + weston-info &> $debug_data_dir/weston-info.txt + else + touch $debug_data_dir/weston-info-absent + fi + if type -p weston &>/dev/null; then + weston --version &> $debug_data_dir/weston-version.txt + else + touch $debug_data_dir/weston-absent + fi + if type -p xprop &>/dev/null; then + xprop -root &> $debug_data_dir/xprop_root.txt + else + touch $debug_data_dir/xprop-absent + fi + if type -p xprop &>/dev/null; then + glxinfo &> $debug_data_dir/glxinfo.txt + else + touch $debug_data_dir/glxinfo-absent + fi + if type -p xdpyinfo &>/dev/null; then + xdpyinfo &> $debug_data_dir/xdpyinfo.txt + else + touch $debug_data_dir/xdpyinfo-absent + fi + if type -p xrandr &>/dev/null; then + xrandr &> $debug_data_dir/xrandr.txt + else + touch $debug_data_dir/xrandr-absent + fi + if type -p X &>/dev/null; then + X -version &> $debug_data_dir/x-version.txt + else + touch $debug_data_dir/x-absent + fi + if type -p Xorg &>/dev/null; then + Xorg -version &> $debug_data_dir/xorg-version.txt + else + touch $debug_data_dir/xorg-absent + fi + echo $GNOME_DESKTOP_SESSION_ID &> $debug_data_dir/gnome-desktop-session-id.txt # kde 3 id echo $KDE_FULL_SESSION &> $debug_data_dir/kde3-ful-session.txt @@ -1948,7 +1983,7 @@ debug_data_collector() gpart status &> $debug_data_dir/bsd-gpart-status.txt swapctl -l -k &> $debug_data_dir/bsd-swapctl-l-k.txt swapon -s &> $debug_data_dir/swapon-s.txt - sysctl -b kern.geom.conftxt &> $debug_data_dir/bsd-sysctl-b-kern.geom.conftxt.txt + sysctl -b kern.geom.conftxt &> $debug_data_dir/bsd-sysctl-b-kern.geom.conftxt.txt sysctl -b kern.geom.confxml &> $debug_data_dir/bsd-sysctl-b-kern.geom.confxml.txt zfs list &> $debug_data_dir/bsd-zfs-list.txt zpool list &> $debug_data_dir/bsd-zpool-list.txt @@ -3398,22 +3433,30 @@ get_irc_client_version() # possible failure of wildcard so make it explicit quassel*) # sample: quassel -v - # Qt: 4.5.0 + ## Qt: 4.5.0 - in Qt4 the output came from src/common/quassel.cpp # KDE: 4.2.65 (KDE 4.2.65 (KDE 4.3 >= 20090226)) # Quassel IRC: v0.4.0 [+60] (git-22effe5) # note: early < 0.4.1 quassels do not have -v - IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v 2>/dev/null | gawk -F ': ' ' + ## Qt: 5: sample: quassel -v + # quassel v0.13-pre (0.12.0+5 git-8e2f578) + # because in Qt5 the internal CommandLineParser is used + IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v 2>/dev/null | gawk ' BEGIN { IGNORECASE=1 clientVersion="" } - /Quassel IRC/ { + # qt 4 -v syntax + /^Quassel IRC:/ { + clientVersion = $3 + } + # qt 5 -v syntax + /^quassel\s[v]?[0-9]/ { clientVersion = $2 } END { # this handles pre 0.4.1 cases with no -v if ( clientVersion == "" ) { - clientVersion = "(pre v0.4.1)" + clientVersion = "(pre v0.4.1)?" } print clientVersion }' )" @@ -4554,7 +4597,7 @@ get_desktop_environment() fi fi desktop_environment="Cinnamon" - elif [[ -n $xprop_root && -n $( grep -is '^_MARCO' <<< "$xprop_root" ) ]];then + elif [[ $XDG_CURRENT_DESKTOP == 'MATE' ]] || [[ -n $xprop_root && -n $( grep -is '^_MARCO' <<< "$xprop_root" ) ]];then version=$( get_program_version 'mate-about' '^MATE[[:space:]]DESKTOP' 'NF' ) # not certain cinn/mate will always have version, so keep output right if not if [[ -n $version ]];then @@ -4751,6 +4794,7 @@ get_desktop_environment() if [[ -n $version ]];then version=" $version" fi + log_function_data "desktop_environment version: $desktop_environment$version" echo "$desktop_environment$version" eval $LOGFE } @@ -4789,7 +4833,7 @@ get_program_version() version_data="$( $1 $get_version 2>/dev/null )" ;; esac - + log_function_data "version data: $version_data" if [[ -n $version_data ]];then version=$( gawk ' BEGIN { @@ -4803,6 +4847,7 @@ get_program_version() exit # quit after first match prints }' <<< "$version_data" ) fi + log_function_data "program version: $version" echo $version } @@ -4826,6 +4871,7 @@ get_desktop_extra_data() print desktops } ' ) + log_function_data "de_data: $de_data" echo $de_data eval $LOGFE @@ -4896,6 +4942,7 @@ get_de_gtk_data() fi fi fi + log_function_data "toolkit: $toolkit" echo $toolkit eval $LOGFE |