mirror of
https://github.com/smxi/inxi.git
synced 2025-01-18 16:37:49 +00:00
branch one, possible mate fix
This commit is contained in:
inxi-svn
parent
ac8a8d2201
commit
fb94f5f219
84
inxi
84
inxi
|
|
@ -1,9 +1,9 @@
|
|||
#!/usr/bin/env bash
|
||||
########################################################################
|
||||
#### Script Name: inxi
|
||||
#### Version: 2.2.18
|
||||
#### Date: 2015-02-14
|
||||
#### Patch Number: 02-b1
|
||||
#### Version: 2.2.20
|
||||
#### Date: 2015-05-11
|
||||
#### Patch Number: 01-b1
|
||||
########################################################################
|
||||
#### 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
|
||||
|
|
@ -2857,7 +2892,7 @@ show_options()
|
|||
print_lines_basic "1" "-o" "Unmounted $partition_string information (includes UUID and LABEL if available). Shows file system type if you have file installed, if you are root OR if you have added to /etc/sudoers (sudo v. 1.7 or newer) Example:^<username>^ALL^=^NOPASSWD:^/usr/bin/file^"
|
||||
print_lines_basic "1" "-p" "Full $partition_string information (-P plus all other detected ${partition_string}s)."
|
||||
print_lines_basic "1" "-P" "Basic $partition_string information (shows what -v^4 would show, but without extra data). Shows, if detected: / /boot /home /tmp /usr /var. Use -p to see all mounted ${partition_string}s."
|
||||
print_lines_basic "1" "-r" "Distro repository data. Supported repo types: APT; PACMAN; PISI; YUM; URPMQ; Ports."
|
||||
print_lines_basic "1" "-r" "Distro repository data. Supported repo types: APT; PACMAN; PISI; PORTAGE; PORTS (BSDs); SLACKPKG; URPMQ; YUM; ZYPP."
|
||||
print_lines_basic "1" "-R" "RAID data. Shows RAID devices, states, levels, and components, and extra data with -x/-xx. md-raid: If device is resyncing, shows resync progress line as well."
|
||||
print_lines_basic "1" "-s" "Sensors output (if sensors installed/configured): mobo/cpu/gpu temp; detected fan speeds. Gpu temp only for Fglrx/Nvidia drivers. Nvidia shows screen number for > 1 screens."
|
||||
print_lines_basic "1" "-S" "System information: host name, kernel, desktop environment (if in X), distro"
|
||||
|
|
@ -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
|
||||
|
|
@ -13614,7 +13657,12 @@ print_repo_data()
|
|||
fi
|
||||
done <<< "$REPO_DATA"
|
||||
else
|
||||
repo_full=$( create_print_line "Repos:" "${C1}Error$SEP3${C2} $SCRIPT_NAME does not support this feature for your distro yet." )
|
||||
if [[ $BSD_TYPE == 'bsd' ]];then
|
||||
repo_type='OS type'
|
||||
else
|
||||
repo_type="package manager"
|
||||
fi
|
||||
repo_full=$( create_print_line "Repos:" "${C1}Error$SEP3${C2} No repo data detected. Does $SCRIPT_NAME support your $repo_type?" )
|
||||
print_screen_output "$repo_full"
|
||||
fi
|
||||
eval $LOGFE
|
||||
|
|
|
|||
Loading…
Reference in a new issue