mirror of
https://github.com/smxi/inxi.git
synced 2025-01-31 10:02:18 +00:00
New version, tarball. This fixes a qt5 glitch with Quassel id, hopefully anyway.
This commit is contained in:
parent
7336dc6440
commit
1a1e84bc8c
69
inxi
69
inxi
|
@ -1,8 +1,8 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
########################################################################
|
########################################################################
|
||||||
#### Script Name: inxi
|
#### Script Name: inxi
|
||||||
#### Version: 2.2.19
|
#### Version: 2.2.20
|
||||||
#### Date: 2015-02-15
|
#### Date: 2015-05-11
|
||||||
#### Patch Number: 00
|
#### Patch Number: 00
|
||||||
########################################################################
|
########################################################################
|
||||||
#### SPECIAL THANKS
|
#### SPECIAL THANKS
|
||||||
|
@ -1903,13 +1903,48 @@ debug_data_collector()
|
||||||
else
|
else
|
||||||
touch $debug_data_dir/xorg-conf-d-files-absent
|
touch $debug_data_dir/xorg-conf-d-files-absent
|
||||||
fi
|
fi
|
||||||
echo 'Collecting X, xprop, glxinfo, xrandr, xdpyinfo data...'
|
echo 'Collecting X, xprop, glxinfo, xrandr, xdpyinfo data, wayland, weston...'
|
||||||
xprop -root &> $debug_data_dir/xprop_root.txt
|
if type -p weston-info &>/dev/null; then
|
||||||
glxinfo &> $debug_data_dir/glxinfo.txt
|
weston-info &> $debug_data_dir/weston-info.txt
|
||||||
xdpyinfo &> $debug_data_dir/xdpyinfo.txt
|
else
|
||||||
xrandr &> $debug_data_dir/xrandr.txt
|
touch $debug_data_dir/weston-info-absent
|
||||||
X -version &> $debug_data_dir/x-version.txt
|
fi
|
||||||
Xorg -version &> $debug_data_dir/xorg-version.txt
|
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
|
echo $GNOME_DESKTOP_SESSION_ID &> $debug_data_dir/gnome-desktop-session-id.txt
|
||||||
# kde 3 id
|
# kde 3 id
|
||||||
echo $KDE_FULL_SESSION &> $debug_data_dir/kde3-ful-session.txt
|
echo $KDE_FULL_SESSION &> $debug_data_dir/kde3-ful-session.txt
|
||||||
|
@ -3398,22 +3433,30 @@ get_irc_client_version()
|
||||||
# possible failure of wildcard so make it explicit
|
# possible failure of wildcard so make it explicit
|
||||||
quassel*)
|
quassel*)
|
||||||
# sample: quassel -v
|
# 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))
|
# KDE: 4.2.65 (KDE 4.2.65 (KDE 4.3 >= 20090226))
|
||||||
# Quassel IRC: v0.4.0 [+60] (git-22effe5)
|
# Quassel IRC: v0.4.0 [+60] (git-22effe5)
|
||||||
# note: early < 0.4.1 quassels do not have -v
|
# 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 {
|
BEGIN {
|
||||||
IGNORECASE=1
|
IGNORECASE=1
|
||||||
clientVersion=""
|
clientVersion=""
|
||||||
}
|
}
|
||||||
/Quassel IRC/ {
|
# qt 4 -v syntax
|
||||||
|
/^Quassel IRC:/ {
|
||||||
|
clientVersion = $3
|
||||||
|
}
|
||||||
|
# qt 5 -v syntax
|
||||||
|
/^quassel\s[v]?[0-9]/ {
|
||||||
clientVersion = $2
|
clientVersion = $2
|
||||||
}
|
}
|
||||||
END {
|
END {
|
||||||
# this handles pre 0.4.1 cases with no -v
|
# this handles pre 0.4.1 cases with no -v
|
||||||
if ( clientVersion == "" ) {
|
if ( clientVersion == "" ) {
|
||||||
clientVersion = "(pre v0.4.1)"
|
clientVersion = "(pre v0.4.1)?"
|
||||||
}
|
}
|
||||||
print clientVersion
|
print clientVersion
|
||||||
}' )"
|
}' )"
|
||||||
|
|
|
@ -1,3 +1,15 @@
|
||||||
|
=====================================================================================
|
||||||
|
Version: 2.2.20
|
||||||
|
Patch Version: 00
|
||||||
|
Script Date: 2015-05-11
|
||||||
|
-----------------------------------
|
||||||
|
Changes:
|
||||||
|
-----------------------------------
|
||||||
|
New version, tarball. This fixes a qt5 glitch with Quassel id, hopefully anyway.
|
||||||
|
|
||||||
|
-----------------------------------
|
||||||
|
-- Harald Hope - Mon, 11 May 2015 15:08:30 -0700
|
||||||
|
|
||||||
=====================================================================================
|
=====================================================================================
|
||||||
Version: 2.2.19
|
Version: 2.2.19
|
||||||
Patch Version: 00
|
Patch Version: 00
|
||||||
|
|
Loading…
Reference in a new issue