dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-17 00:31:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
inxi/inxi

11625 lines
392 KiB
Plaintext
Raw Normal View History

New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
#!/usr/bin/env bash
Initial setup of repo
2008-10-28 00:40:43 +00:00
########################################################################
#### Script Name: inxi
New version: fixed an old bug, with -c 0, no colors, RED and NORMAL color codes were not set to null, which results in some cases with red output, along with turning terminal/console font color red.
2014-03-26 19:46:58 +00:00
#### Version: 2.1.11
#### Date: 2014-03-26
new tarball, version, bug fixes on weather, also optimized speed for slow isps, and added a global that can be set in user / system configs to make a longer wget time out. Default is 8 seconds. This should take care of the failure from slow load issue reported.
2013-05-18 05:14:27 +00:00
#### Patch Number: 00
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
########################################################################
#### SPECIAL THANKS
########################################################################
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
#### Special thanks to all those in #lsc and #smxi for their tireless
#### dedication helping test inxi modules.
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
########################################################################
#### ABOUT INXI
Initial setup of repo
2008-10-28 00:40:43 +00:00
########################################################################
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
2013-01-23 22:05:47 +00:00
#### inxi is a fork of infobash 3.02, the original bash sys info tool by locsmif
Just some small cleanups and code fixes
2008-11-05 06:16:33 +00:00
#### As time permits functionality improvements and recoding will occur.
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
####
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
2013-01-23 22:05:47 +00:00
#### inxi, the universal, portable, system information tool for irc.
Initial setup of repo
2008-10-28 00:40:43 +00:00
#### Tested with Irssi, Xchat, Konversation, BitchX, KSirc, ircII,
#### Gaim/Pidgin, Weechat, KVIrc and Kopete.
more refactoring
2008-10-29 03:03:18 +00:00
#### Original infobash author and copyright holder:
(Change Version) This is now launching inxi as an official script. Changed the default download url to get it directly from google svn. This means that users can always reference the official svn copy to ensure that the code is what it claims to be. Added for development purposes new advanced testing options: -! 1 triggers the boolean testing flag -! 2 triggers an alternative development download -! http://<any website>/path_to_download_directory/ (note: must end in /, and not include inxi file name Updated the script_self_updater function to handle variable download urls, and added an update message that lets the person know where the update source was. Added error handler for user provided testing download urls, if not existing, exit. And with this, I'm handing over control to the inxi project itself.
2008-11-11 18:37:09 +00:00
#### Copyright (C) 2005-2007 Michiel de Boer a.k.a. locsmif
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
#### inxi version: Copyright (C) 2008-2014 Scott Rogers & Harald Hope
A few major changes: in get client data, got rid of loose detections like *xchat* or *sh* and replaced them with tight, literals in the case list. This might trigger a few failures, but it's better to then handle those failures explicitly in my opinion than to depend on something as loose as *sh*, which will catch any app with sh ever made. Moved advanced hard disk data to be triggered now by -H, to avoid spamming irc. In the future, -x, extra data, will only be used for really silly little things like bogomips, ports, and so on, stuff that's short and basically just of interest to a few people.
2008-11-09 19:51:33 +00:00
#### Further fixes (listed as known): Horst Tritremmel <hjt at sidux.com>
(change version) New feature in swap partition data: show percent used, this is a damentz patch
2009-03-02 00:52:09 +00:00
#### Steven Barrett (aka: damentz) - usb audio patch; swap percent used patch
user patch, added support, as root user, for dmidecode in -M data. This helps users of older systems get system machine data.
2012-03-26 21:41:53 +00:00
#### Jarett.Stevens - dmidecde -M patch for older systems with the /sys
Added hack to get distro for arch, which has a bug about empty /etc/arch-release and jumbled /etc/issue
2008-10-30 22:04:26 +00:00
####
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
2013-01-23 22:05:47 +00:00
#### Current script home page/wiki/svn: http://inxi.googlecode.com
#### Script forums: http://techpatterns.com/forums/forum-33.html
#### IRC support: irc.oftc.net channel #smxi
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
####
Initial setup of repo
2008-10-28 00:40:43 +00:00
#### This program is free software; you can redistribute it and/or modify
#### it under the terms of the GNU General Public License as published by
#### the Free Software Foundation; either version 3 of the License, or
#### (at your option) any later version.
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
####
Initial setup of repo
2008-10-28 00:40:43 +00:00
#### This program is distributed in the hope that it will be useful,
#### but WITHOUT ANY WARRANTY; without even the implied warranty of
#### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#### GNU General Public License for more details.
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
####
Initial setup of repo
2008-10-28 00:40:43 +00:00
#### You should have received a copy of the GNU General Public License
#### along with this program. If not, see <http://www.gnu.org/licenses/>.
(Change Version) This is another milestone, hit much sooner than we thought. We have now restored the broken konversation native script support. This will be of special interest to distros who want to include inxi as native, or to packagers. Basically, all that is needed is to set this symbolic link: ln -s <inxi location, ie: /usr/bin/inxi, or /usr/local/bin/inxi> /var/share/apps/konversation/scripts/inxi in the package post install script. This will automatically enable native, ie: /inxi support in konversation. Fixed a few other small bugs, and cleaned up code and comments as well. We were almost going to call this release 1.0.0, but we'll leave that until it's absolutely certain that everything is debugged and working.
2008-11-24 01:46:31 +00:00
####
#### If you don't understand what Free Software is, please read (or reread)
#### this page: http://www.gnu.org/philosophy/free-sw.html
(Change Version) This is now launching inxi as an official script. Changed the default download url to get it directly from google svn. This means that users can always reference the official svn copy to ensure that the code is what it claims to be. Added for development purposes new advanced testing options: -! 1 triggers the boolean testing flag -! 2 triggers an alternative development download -! http://<any website>/path_to_download_directory/ (note: must end in /, and not include inxi file name Updated the script_self_updater function to handle variable download urls, and added an update message that lets the person know where the update source was. Added error handler for user provided testing download urls, if not existing, exit. And with this, I'm handing over control to the inxi project itself.
2008-11-11 18:37:09 +00:00
########################################################################
more top comment header cleanup
2011-06-21 03:45:36 +00:00
#### * Package names in (...) are the Debian Squeeze package name. Check your
#### distro for proper package name by doing this: which <application>
#### then find what package owns that application file. Or run --recommends
#### which shows package names for Debian/Ubuntu, Arch, and Fedora/Redhat/Suse
####
Initial setup of repo
2008-10-28 00:40:43 +00:00
#### DEPENDENCIES
more top comment header cleanup
2011-06-21 03:45:36 +00:00
#### * bash >=3.0 (bash); df, readlink, stty, tr, uname, wc (coreutils);
#### gawk (gawk); grep (grep); lspci (pciutils);
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
#### ps, uptime (procps); find (findutils)
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
#### * Also the proc filesystem should be present and mounted for Linux
more top comment header cleanup
2011-06-21 03:45:36 +00:00
#### * Some features, like -M and -d will not work, or will work incompletely,
#### if /sys is missing
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
####
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
#### Apparently unpatched bash 3.0 has arrays broken; bug reports:
#### http://ftp.gnu.org/gnu/bash/bash-3.0-patches/bash30-008
#### http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00144.html
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
#### Bash 3.1 for proper array use
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
####
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
#### Arrays work in bash 2.05b, but "grep -Em" does not
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
####
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
#### RECOMMENDS (Needed to run certain features, listed by option)
#### -A - for output of usb audio information: lsusb (usbutils)
forgot to add -Nx to module version recommends
2011-06-11 01:43:11 +00:00
#### -Ax -Nx - for audio/network module version: modinfo (module-init-tools)
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
#### -Dx - for hdd temp output (root only default): hddtemp (hddtemp)
#### For user level hdd temp output: sudo (sudo)
#### Note: requires user action for this feature to run as user (edit /etc/sudoers file)
#### -G - full graphics output requires: glxinfo (mesa-utils); xdpyinfo (X11-utils);
#### xrandr (x11-xserver-utils)
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
#### -i - IP information, local/wan - ip (iproute) legacy, not used if ip present: ifconfig (net-tools)
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
#### -Ix - view current runlevel while not in X window system (or with -x): runlevel (sysvinit)
user patch, added support, as root user, for dmidecode in -M data. This helps users of older systems get system machine data.
2012-03-26 21:41:53 +00:00
#### -M - for older systems whose kernel does not have /sys data for machine, dmidecode (dmidecode)
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
#### -o - for unmounted file system information in unmounted drives (root only default): file (file)
#### Note: requires user action for this feature to run as user (edit /etc/sudoers file)
#### For user level unmounted file system type output: sudo (sudo)
#### -s For any sensors output, fan, temp, etc: sensors (lm-sensors)
#### Note: requires setup of lm-sensors (sensors-detect and adding modules/modprobe/reboot,
#### and ideally, pwmconfig) prior to full output being available.
added comment for recommends on top, X11-utils is needed for xprop for -S
2011-05-18 23:21:23 +00:00
#### -S For desktop environment, user must be in X and have xprop installed (in X11-utils)
Initial setup of repo
2008-10-28 00:40:43 +00:00
########################################################################
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
#### BSD Adjustments
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
#### * sed -i '' form supported by using SED_I="-i ''".
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
#### * Note: New BSD sed supports using -r instead of -E for compatibility with gnu sed
#### However, older, like FreeBSD 7.x, does not have -r so using SED_RX='-E' for this.
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
#### * Gnu grep options can be used if the function component is only run in linux
#### These are the options that bsd grep does not support that inxi uses: -m <number> -o
#### so make sure if you use those to have them in gnu/linux only sections.
#### It appears that freebsd uses gnu grep but openbsd uses bsd grep, however.
#### * BSD ps does not support --without-headers option, and also does not support --sort <option>
#### Tests show that -m fails to sort memory as expected, but -r does sort cpu percentage.
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
#### * BSD_TYPE is set with values null, debian-bsd (debian gnu/kfreebsd), bsd (all other bsds)
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
#### * Subshell and array closing ) must not be on their own line unless you use an explicit \
#### to indicate that logic continues to next line where closing ) or )) are located.
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
########################################################################
(Change Version) This is now launching inxi as an official script. Changed the default download url to get it directly from google svn. This means that users can always reference the official svn copy to ensure that the code is what it claims to be. Added for development purposes new advanced testing options: -! 1 triggers the boolean testing flag -! 2 triggers an alternative development download -! http://<any website>/path_to_download_directory/ (note: must end in /, and not include inxi file name Updated the script_self_updater function to handle variable download urls, and added an update message that lets the person know where the update source was. Added error handler for user provided testing download urls, if not existing, exit. And with this, I'm handing over control to the inxi project itself.
2008-11-11 18:37:09 +00:00
#### CONVENTIONS:
added bullets to top comment information to make it more readable
2011-06-21 03:41:33 +00:00
#### * Character Encoding: UTF-8 - this file contains special characters that must be opened and saved as UTF8
#### * Indentation: TABS
#### * Do not use `....` (back quotes), those are totally non-reabable, use $(....).
#### * Do not use one liner flow controls.
#### The ONLY time you should use ';' (semi-colon) is in this single case: if [[ condition ]];then.
#### Never use compound 'if': ie, if [[ condition ]] && statement.
#### * Note: [[ -n $something ]] - double brackets does not require quotes for variables: ie, "$something".
#### * Always use quotes, double or single, for all string values.
#### * All new code/methods must be in a function.
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
added bullets to top comment information to make it more readable
2011-06-21 03:41:33 +00:00
#### * For all boolean tests, use 'true' / 'false'.
#### !! Do NOT use 0 or 1 unless it's a function return.
#### * Avoid complicated tests in the if condition itself.
#### * To 'return' a value in a function, use 'echo <var>'.
#### * For gawk: use always if ( num_of_cores > 1 ) { hanging { starter for all blocks
#### This lets us use one method for all gawk structures, including BEGIN/END, if, for, etc
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
#### * Using ${VAR} is about 30% slower than $VAR because bash has to check the stuff for actions
#### SUBSHELLS ARE EXPENSIVE! - run these two if you do not believe me.
#### time for (( i=0; i<1000; i++ )) do ff='/usr/local/bin/foo.pid';ff=${ff##*/};ff=${ff%.*};done;echo $ff
#### time for (( i=0; i<1000; i++ )) do ff='/usr/local/bin/foo.pid';ff=$( basename $ff | cut -d '.' -f 1 );done;echo $ff
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
####
(Change Version) This is now launching inxi as an official script. Changed the default download url to get it directly from google svn. This means that users can always reference the official svn copy to ensure that the code is what it claims to be. Added for development purposes new advanced testing options: -! 1 triggers the boolean testing flag -! 2 triggers an alternative development download -! http://<any website>/path_to_download_directory/ (note: must end in /, and not include inxi file name Updated the script_self_updater function to handle variable download urls, and added an update message that lets the person know where the update source was. Added error handler for user provided testing download urls, if not existing, exit. And with this, I'm handing over control to the inxi project itself.
2008-11-11 18:37:09 +00:00
#### VARIABLE/FUNCTION NAMING:
added bullets to top comment information to make it more readable
2011-06-21 03:41:33 +00:00
#### * All functions should follow standard naming--verb adjective noun.
#### ie, get_cpu_data
#### * All variables MUST be initialized / declared explicitly, either top of file, for Globals, or using local
#### * All variables should clearly explain what they are, except counters like i, j.
#### * Each word of Bash variable must be separated by '_' (underscore) (camel form), like: cpu_data
#### * Each word of Gawk variable must be like this (first word lower, following start with upper): cpuData
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
2013-01-23 22:05:47 +00:00
#### * Global variables are 'UPPER CASE', at top of this file.
added bullets to top comment information to make it more readable
2011-06-21 03:41:33 +00:00
#### ie, SOME_VARIABLE=''
#### * Local variables are 'lower case' and declared at the top of the function using local, always.
#### ie: local some_variable=''
#### * Locals that will be inherited by child functions have first char capitalized (so you know they are inherited).
#### ie, Some_Variable
#### * Booleans should start with b_ (local) or B_ (global) and state clearly what is being tested.
#### * Arrays should start with a_ (local) or A_ (global).
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
####
#### SPECIAL NOTES:
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
#### * The color variable ${C2} must always be followed by a space unless you know what
#### character is going to be next for certain. Otherwise irc color codes can be accidentally
#### activated or altered.
#### * For native script konversation support (check distro for correct konvi scripts path):
#### ln -s <path to inxi> /usr/share/apps/konversation/scripts/inxi
#### DCOP doesn't like \n, so avoid using it for most output unless required, as in error messages.
#### * print_screen_output " " # requires space, not null, to avoid error in for example in irssi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
#### * For logging of array data, array must be placed into the a_temp, otherwise only the first key logs
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
#### * In gawk search patterns, . is a wildcard EXCEPT in [0-9.] type containers, then it's a literal
#### So outside of bracketed items, it must be escaped, \. but inside, no need. Outside of gawk it should
#### be escaped in search patterns if you are using it as a literal.
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
####
#### PACKAGE MANAGER DATA (note, while inxi tries to avoid using package managers to get data, sometimes
#### it's the only way to get some data):
#### * dpkg options: http://www.cyberciti.biz/howto/question/linux/dpkg-cheat-sheet.php
#### * pacman options: https://wiki.archlinux.org/index.php/Pacman_Rosetta
updated trunk inxi
2009-05-28 20:26:29 +00:00
####
#### As with all 'rules' there are acceptions, these are noted where used.
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
###################################################################################
#### KDE Konversation information. Moving from dcop(qt3/KDE3) to dbus(qt4/KDE4)
###################################################################################
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
2013-01-23 22:05:47 +00:00
#### * dcop and dbus -- these talk back to Konversation from this program
added bullets to top comment information to make it more readable
2011-06-21 03:41:33 +00:00
#### * Scripting info -- http://konversation.berlios.de/docs/scripting.html
#### -- http://www.kde.org.uk/apps/konversation/
#### * dbus info -- http://dbus.freedesktop.org/doc/dbus-tutorial.html
#### view dbus info -- https://fedorahosted.org/d-feet/
#### -- or run qdbus
#### * Konvi dbus/usage-- qdbus org.kde.konversation /irc say <server> <target-channel> <output>
#### * Python usage -- http://wiki.python.org/moin/DbusExamples (just in case)
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
####
#### Because webpages come and go, the above information needs to be moved to inxi's wiki
(Change Version) This is now launching inxi as an official script. Changed the default download url to get it directly from google svn. This means that users can always reference the official svn copy to ensure that the code is what it claims to be. Added for development purposes new advanced testing options: -! 1 triggers the boolean testing flag -! 2 triggers an alternative development download -! http://<any website>/path_to_download_directory/ (note: must end in /, and not include inxi file name Updated the script_self_updater function to handle variable download urls, and added an update message that lets the person know where the update source was. Added error handler for user provided testing download urls, if not existing, exit. And with this, I'm handing over control to the inxi project itself.
2008-11-11 18:37:09 +00:00
########################################################################
(Change version) This fixes the multiple physical cpu missing data. I had to simplify the ht/smp part to make it work, also, from what I can tell, we only really need the terms: UP SMP HT SMP-HT which cover all possible scenarios from what I can tell http://en.wikipedia.org/wiki/Symmetric_multiprocessing says that it's all basically smp, single cpu, dual core, or multi cpu, single or multi core.
2009-02-03 22:20:11 +00:00
#### Valuable Resources
new version, fixed a long standing weakness, now the long -f full cpu flag output sorts, that's much easier to read. I also made the line lengths on that much more accurate to avoid a bunch of long flags creating a longer line, and made the first line shorter to handle the line starter text. New tarball as well, no man page changes. Not sure why this was left undone for so long, but here it is, nice and neat.
2013-01-18 22:22:58 +00:00
#### CPU flags: http://unix.stackexchange.com/questions/43539/what-do-the-flags-in-proc-cpuinfo-mean
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
#### Advanced Bash: http://wiki.bash-hackers.org/syntax/pe
updated trunk inxi
2009-05-28 20:26:29 +00:00
#### gawk arrays: http://www.math.utah.edu/docs/info/gawk_12.html
Added man pages, including the gz part. No idea why I forgot to do this, this is by aus9 by the way. So there's the man pages, needs some work, but at least it's something.
2012-05-06 23:38:13 +00:00
#### raid mdstat: http://www-01.ibm.com/support/docview.wss?uid=isg3T1011259
#### http://www.howtoforge.com/replacing_hard_disks_in_a_raid1_array
added link in comments to raid info
2012-05-11 21:59:04 +00:00
#### https://raid.wiki.kernel.org/index.php/Mdstat
(Change version) This fixes the multiple physical cpu missing data. I had to simplify the ht/smp part to make it work, also, from what I can tell, we only really need the terms: UP SMP HT SMP-HT which cover all possible scenarios from what I can tell http://en.wikipedia.org/wiki/Symmetric_multiprocessing says that it's all basically smp, single cpu, dual core, or multi cpu, single or multi core.
2009-02-03 22:20:11 +00:00
########################################################################
(Change Version) This is now launching inxi as an official script. Changed the default download url to get it directly from google svn. This means that users can always reference the official svn copy to ensure that the code is what it claims to be. Added for development purposes new advanced testing options: -! 1 triggers the boolean testing flag -! 2 triggers an alternative development download -! http://<any website>/path_to_download_directory/ (note: must end in /, and not include inxi file name Updated the script_self_updater function to handle variable download urls, and added an update message that lets the person know where the update source was. Added error handler for user provided testing download urls, if not existing, exit. And with this, I'm handing over control to the inxi project itself.
2008-11-11 18:37:09 +00:00
#### TESTING FLAGS
#### inxi supports advanced testing triggers to do various things, using -! <arg>
updated trunk inxi
2009-05-28 20:26:29 +00:00
#### -! 1 - triggers default B_TESTING_1='true' to trigger some test or other
#### -! 2 - triggers default B_TESTING_2='true' to trigger some test or other
#### -! 3 - triggers B_TESTING_1='true' and B_TESTING_2='true'
(Change Version) More future proofing, updated -! conditions to use more reasonable numbers: 1,2,3 -! are now setting testing booleans 10,11,12,http://.... now set alt downloads
2008-11-13 02:45:35 +00:00
#### -! 10 - triggers an update from the primary dev download server instead of svn
#### -! 11 - triggers an update from svn branch one - if present, of course
#### -! 12 - triggers an update from svn branch two - if present, of course
finished up help menu items for branches
2009-02-18 06:33:30 +00:00
#### -! 13 - triggers an update from svn branch three - if present, of course
#### -! 14 - triggers an update from svn branch four - if present, of course
(Change Version) This is now launching inxi as an official script. Changed the default download url to get it directly from google svn. This means that users can always reference the official svn copy to ensure that the code is what it claims to be. Added for development purposes new advanced testing options: -! 1 triggers the boolean testing flag -! 2 triggers an alternative development download -! http://<any website>/path_to_download_directory/ (note: must end in /, and not include inxi file name Updated the script_self_updater function to handle variable download urls, and added an update message that lets the person know where the update source was. Added error handler for user provided testing download urls, if not existing, exit. And with this, I'm handing over control to the inxi project itself.
2008-11-11 18:37:09 +00:00
#### -! <http://......> - Triggers an update from whatever server you list.
more top comment header cleanup
2011-06-21 03:45:36 +00:00
#### LOG FLAGS (logs to $HOME/.inxi/inxi.log with rotate 3 total)
added comments for logging
2009-05-29 03:27:19 +00:00
#### -@ 8 - Basic data logging of generated data / array values
#### -@ 9 - Full logging of all data used, including cat of files and system data
#### -@ 10 - Basic data logging plus color code logging
(Change Version) This is now launching inxi as an official script. Changed the default download url to get it directly from google svn. This means that users can always reference the official svn copy to ensure that the code is what it claims to be. Added for development purposes new advanced testing options: -! 1 triggers the boolean testing flag -! 2 triggers an alternative development download -! http://<any website>/path_to_download_directory/ (note: must end in /, and not include inxi file name Updated the script_self_updater function to handle variable download urls, and added an update message that lets the person know where the update source was. Added error handler for user provided testing download urls, if not existing, exit. And with this, I'm handing over control to the inxi project itself.
2008-11-11 18:37:09 +00:00
########################################################################
Initial setup of repo
2008-10-28 00:40:43 +00:00
#### VARIABLES
########################################################################
note about hwinfo as possible tool
2008-11-01 22:24:04 +00:00
## NOTE: we can use hwinfo if it's available in all systems, or most, to get
## a lot more data and verbosity levels going
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
### DISTRO MAINTAINER FLAGS ###
# flag to allow distro maintainers to turn off update features. If false, turns off
# -U and -! testing/advanced update options, as well as removing the -U help menu item
# NOTE: Usually you want to create these in /etc/inxi.conf to avoid having to update each time
B_ALLOW_UPDATE='true'
B_ALLOW_WEATHER='true'
### USER CONFIGS: SET IN inxi.conf file see wiki for directions ###
# http://code.google.com/p/inxi/wiki/script_configuration_files
(change version) a small issue fix, where cpu spike caused by inxi itself gives a bad cpu speed. Solution, put a 0.3 sleep time right before we get the cpu data. Less than 0.3 wasn't s reliable, not sure how much time the kernel needs to slow down cpus again. user can set config override of this time easily. Maybe one day inxi will be released with config files in /etc, then this stuff can be documented better in the file. I found the sleep largely unnoticeable in my tests.
2010-02-15 05:05:47 +00:00
# override in user config if desired, seems like less than .3 doesn't work as reliably
CPU_SLEEP='0.3'
1.5.2: new options: -z, triggers output filtering. This is default on for irc client output. -Z - absolute override, turns off all filtering. This is useful if you are helping someone on irc for example and need to see this data. Fixed a long term bug in the regex that filtered out home name from mount paths in partitions, was greedy, now it just filters out only the name and prints the rest of the full path, as it should. Added twm to desktop support list, that has no --version output so that won't show.
2011-05-24 20:47:22 +00:00
FILTER_STRING='<filter>'
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
# for features like help/version will fit to terminal / console screen width. Console
# widths will be dynamically set in main() based on cols in term/console
COLS_MAX_CONSOLE='115'
COLS_MAX_IRC='105'
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# note, this is console out of x/display server, will also be set dynamically
# not used currently, but maybe in future
COLS_MAX_NO_DISPLAY='140'
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
PS_COUNT=5
new tarball, version, bug fixes on weather, also optimized speed for slow isps, and added a global that can be set in user / system configs to make a longer wget time out. Default is 8 seconds. This should take care of the failure from slow load issue reported.
2013-05-18 05:14:27 +00:00
# change to less, or more if you have very slow connection
WGET_TIMEOUT=8
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
### END USER CONFIGS ###
### LOCALIZATION - DO NOT CHANGE! ###
# set to default LANG to avoid locales errors with , or .
LANG=C
# Make sure every program speaks English.
LC_ALL="C"
export LC_ALL
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
### ARRAYS ###
## Prep
# Clear nullglob, because it creates unpredictable situations with IFS=$'\n' ARR=($VAR) IFS="$ORIGINAL_IFS"
# type constructs. Stuff like [rev a1] is now seen as a glob expansion pattern, and fails, and
# therefore results in nothing.
shopt -u nullglob
## info on bash built in: $IFS - http://tldp.org/LDP/abs/html/internalvariables.html
# Backup the current Internal Field Separator
ORIGINAL_IFS="$IFS"
## Initialize
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
A_ALSA_DATA=''
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
A_AUDIO_DATA=''
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
A_CMDL=''
Updated get_cpu_core_count to return an array of data like other functions, this helps make methods more consistent over all get data functions
2008-11-04 22:08:46 +00:00
A_CPU_CORE_DATA=''
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
A_CPU_DATA=''
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
A_CPU_TYPE_PCNT_CCNT=''
(change version) Fixed debugger for real this time, now it actually works as intended. The infobash debugger never worked at all, unless you explicitly turned it on with debugging flag. Now it does. Pre script up errors will be stored in the error array, and printed out if found automatically no matter what the debugging flag is set to. This is a perfect example of why using highly compressed code with no explicit variable declarations is ALWAYS a bad idea.
2008-12-14 17:20:02 +00:00
A_DEBUG_BUFFER=''
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
A_GCC_VERSIONS=''
Fixed messup with gfx arrays, mixed up glx and gfx
2008-10-30 07:23:45 +00:00
A_GLX_DATA=''
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
A_GRAPHICS_CARD_DATA=''
changed gfx drivers to use array for better output control, and also for future other gfx features
2011-05-25 01:53:20 +00:00
A_GRAPHIC_DRIVERS=''
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
A_HDD_DATA=''
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
A_INIT_DATA=''
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
A_INTERFACES_DATA=''
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
A_MACHINE_DATA=''
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
A_NETWORK_DATA=''
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
A_OPTICAL_DRIVE_DATA=''
Changed partition data to work like other functions, create array of array data, then loop through it to print
2008-11-04 03:03:29 +00:00
A_PARTITION_DATA=''
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
A_PCICONF_DATA=''
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
A_PS_DATA=''
Added man pages, including the gz part. No idea why I forgot to do this, this is by aus9 by the way. So there's the man pages, needs some work, but at least it's something.
2012-05-06 23:38:13 +00:00
A_RAID_DATA=''
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
A_SENSORS_DATA=''
(change version) new feature and option: -o shows unmounted local partitions, with uuid and label if present. Does not show with -F to avoid excessive output
2010-01-09 04:05:21 +00:00
A_UNMOUNTED_PARTITION_DATA=''
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
A_WEATHER_DATA=''
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
A_DISPLAY_SERVER_DATA=''
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
### BOOLEANS ###
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
## standard boolean flags ##
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
B_BSD_RAID='false'
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
B_COLOR_SCHEME_SET='false'
B_CONSOLE_IRC='false'
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
# triggers full display of cpu flags
B_CPU_FLAGS_FULL='false'
and some more variable ordering
2010-01-09 04:57:00 +00:00
# test for dbus irc client
B_DBUS_CLIENT='false'
Change version: Bug fix, added in globals B_DCOP / B_QDBUS for pretests of dcop/qdbus. Need to set both because some systems have both. Bug fix, added squashfs and unionfs to excluded fs types to clean up -p output for partition data
2010-06-11 03:44:19 +00:00
# kde dcop
B_DCOP='false'
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
# Debug flood override: make 'true' to allow long debug output
B_DEBUG_FLOOD='false'
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
B_DMIDECODE_SET='false'
Trying -x option for extra data output with bogomips, but note: bmips is I believe per core, so needs to actually be calculated correctly, currently showing for only one core
2008-11-03 21:30:34 +00:00
# show extra output data
B_EXTRA_DATA='false'
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
# triggered by -xx
B_EXTRA_EXTRA_DATA='false'
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
B_ID_SET='false'
Redid get_parameters to use getops single letter method, this is cleaner and easier to maintain and test for. Added options -c for color scheme, -d for default (same as previous -v1 or -v), -T testing, allows trigger of experimental new methods or outputs or functions.
2008-11-01 21:24:45 +00:00
# override certain errors due to currupted data
B_HANDLE_CORRUPT_DATA='false'
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
B_LABEL_SET='false'
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
B_LSPCI='false'
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
B_LOG_COLORS='false'
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
B_LOG_FULL_DATA='false'
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
B_MAPPER_SET='false'
1.5.2: new options: -z, triggers output filtering. This is default on for irc client output. -Z - absolute override, turns off all filtering. This is useful if you are helping someone on irc for example and need to see this data. Fixed a long term bug in the regex that filtered out home name from mount paths in partitions, was greedy, now it just filters out only the name and prints the rest of the full path, as it should. Added twm to desktop support list, that has no --version output so that won't show.
2011-05-24 20:47:22 +00:00
B_OUTPUT_FILTER='false'
B_OVERRIDE_FILTER='false'
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
B_PCICONF='false'
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
B_PCICONF_SET='false'
Change version: Bug fix, added in globals B_DCOP / B_QDBUS for pretests of dcop/qdbus. Need to set both because some systems have both. Bug fix, added squashfs and unionfs to excluded fs types to clean up -p output for partition data
2010-06-11 03:44:19 +00:00
# kde qdbus
B_QDBUS='false'
added more wifi detection filters
2011-06-09 01:51:46 +00:00
B_PORTABLE='false'
New version, updated man page. A bug fix for an old time bug: with mdraid, -o (unmounted partitions) would show components of the md raid array as unmounted partitions. This is of course incorrect, and is now fixed. Small update of man page as well to note that -o will not show components of mdraid arrays.
2013-02-28 06:12:04 +00:00
B_RAID_SET='false'
(Change Version) Fixed long standing bug with root user getting null output for res or tty, now if in X, shows message that gfx data is not available to root. Also added null case handling for some of the gfx output to show N/A instead of null. This lets me know which detection fails, which should make debugging a bit easier long term. Turned off the advanced glx info line as well for root user.
2009-03-16 19:41:11 +00:00
B_ROOT='false'
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
B_RUN_COLOR_SELECTOR='false'
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
B_RUNNING_IN_DISPLAY='false' # in x type display server
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
if tty >/dev/null;then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
B_IRC='false'
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
else
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
B_IRC='true'
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
fi
(change version) Fixed debugger for real this time, now it actually works as intended. The infobash debugger never worked at all, unless you explicitly turned it on with debugging flag. Now it does. Pre script up errors will be stored in the error array, and printed out if found automatically no matter what the debugging flag is set to. This is a perfect example of why using highly compressed code with no explicit variable declarations is ALWAYS a bad idea.
2008-12-14 17:20:02 +00:00
# this sets the debug buffer
B_SCRIPT_UP='false'
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
B_SHOW_ADVANCED_NETWORK='false'
(Change Version Number) To make it more consistent, changed -s to -A, and changed the 'Sound' line starter to Audio This makes all primary line switches upper case, and only -f which is an addon to CPU lower.
2008-11-10 22:57:35 +00:00
# Show sound card data
B_SHOW_AUDIO='false'
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
B_SHOW_BASIC_RAID='false'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
B_SHOW_BASIC_CPU='false'
B_SHOW_BASIC_DISK='false'
arg cleanup
2011-06-18 03:29:49 +00:00
B_SHOW_BASIC_OPTICAL='false'
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
B_SHOW_CPU='false'
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
B_SHOW_DISPLAY_DATA='false'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
B_SHOW_DISK_TOTAL='false'
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
B_SHOW_DISK='false'
A few major changes: in get client data, got rid of loose detections like *xchat* or *sh* and replaced them with tight, literals in the case list. This might trigger a few failures, but it's better to then handle those failures explicitly in my opinion than to depend on something as loose as *sh*, which will catch any app with sh ever made. Moved advanced hard disk data to be triggered now by -H, to avoid spamming irc. In the future, -x, extra data, will only be used for really silly little things like bogomips, ports, and so on, stuff that's short and basically just of interest to a few people.
2008-11-09 19:51:33 +00:00
# Show full hard disk output
B_SHOW_FULL_HDD='false'
fixed a bug
2011-06-18 03:49:53 +00:00
B_SHOW_FULL_OPTICAL='false'
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
B_SHOW_GRAPHICS='false'
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# Set this to 'false' to avoid printing the hostname, can be set false now
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
B_SHOW_HOST='true'
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
B_SHOW_INFO='false'
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
B_SHOW_IP='false'
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
B_SHOW_LABELS='false'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
B_SHOW_MACHINE='false'
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
B_SHOW_NETWORK='false'
(Change version) New option -p, outputs all discovered partition information along with the -P stuff. -P was improved to also show /tmp and /usr by default. -p will not show with -F to avoid flooding issues.
2008-12-03 23:14:21 +00:00
# either -v > 3 or -P will show partitions
Fixed small show partitions bug
2008-11-10 02:50:00 +00:00
B_SHOW_PARTITIONS='false'
(Change version) New option -p, outputs all discovered partition information along with the -P stuff. -P was improved to also show /tmp and /usr by default. -p will not show with -F to avoid flooding issues.
2008-12-03 23:14:21 +00:00
B_SHOW_PARTITIONS_FULL='false'
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
B_SHOW_PS_CPU_DATA='false'
B_SHOW_PS_MEM_DATA='false'
Added man pages, including the gz part. No idea why I forgot to do this, this is by aus9 by the way. So there's the man pages, needs some work, but at least it's something.
2012-05-06 23:38:13 +00:00
B_SHOW_RAID='false'
By suggestion and good sense, -R has been modified. New tarball as well. Now RAID works like this: -b - if no /proc/mdstat, or if no devices found and module is running, show nothing, otherwise show short form as before -F - if no proc/mdstat, show nothing, if no devices but mdstat and if -xx, show all lines, otherwise show normal -R - show all messages and missing file/module information so users, particularly sys admins, know right away module is running even if no devices. -v 6 and less, like -F. -v 7, like -R run, ie, show all messages. this gets rid of unneeded line output given that only if you have md_mod running will you have any data for /proc/mdstat and that module is only running if you have mdraid installed. Also redid the no data messages for no module state and no devices state to better reflect what is actually happening. Good adjustment and good cleanup of unneeded output while tightening the actual usability of the specific messages received.
2012-05-15 01:51:58 +00:00
# because many systems have no mdstat file, -b/-F should not show error if no raid file found
B_SHOW_RAID_R='false'
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
B_SHOW_REPOS='false'
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
B_SHOW_SENSORS='false'
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
# triggers only short inxi output
B_SHOW_SHORT_OUTPUT='false'
B_SHOW_SYSTEM='false'
(change version) new feature and option: -o shows unmounted local partitions, with uuid and label if present. Does not show with -F to avoid excessive output
2010-01-09 04:05:21 +00:00
B_SHOW_UNMOUNTED_PARTITIONS='false'
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
B_SHOW_UUIDS='false'
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
B_SHOW_WEATHER='false'
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
B_SYSCTL='false'
Redid get_parameters to use getops single letter method, this is cleaner and easier to maintain and test for. Added options -c for color scheme, -d for default (same as previous -v1 or -v), -T testing, allows trigger of experimental new methods or outputs or functions.
2008-11-01 21:24:45 +00:00
# triggers various debugging and new option testing
(No Version Change) Changed B_TESTING_FLAG to B_TESTING_1 to cover future cases where we run multiple testing option flags. These last changes are all for future development, none are related to currently active stuff.
2008-11-13 02:40:01 +00:00
B_TESTING_1='false'
(Change Version) More future proofing, updated -! conditions to use more reasonable numbers: 1,2,3 -! are now setting testing booleans 10,11,12,http://.... now set alt downloads
2008-11-13 02:45:35 +00:00
B_TESTING_2='false'
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
B_UPLOAD_DEBUG_DATA='false'
bug fix, first patch, usb networking wasn't working, not sure why this was never reported
2011-11-22 06:31:28 +00:00
B_USB_NETWORKING='false'
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
# set to true here for debug logging from script start
B_USE_LOGGING='false'
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
B_UUID_SET='false'
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
B_XORG_LOG='false'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
## Directory/file exist flags; test as [[ $(boolean) ]] not [[ $boolean ]]
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
B_ASOUND_DEVICE_FILE='false'
B_ASOUND_VERSION_FILE='false'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
B_BASH_ARRAY='false'
and some more variable ordering
2010-01-09 04:57:00 +00:00
B_CPUINFO_FILE='false'
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
B_DMESG_BOOT_FILE='false' # bsd only
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
B_LSB_FILE='false'
Added man pages, including the gz part. No idea why I forgot to do this, this is by aus9 by the way. So there's the man pages, needs some work, but at least it's something.
2012-05-06 23:38:13 +00:00
B_MDSTAT_FILE='false'
and some more variable ordering
2010-01-09 04:57:00 +00:00
B_MEMINFO_FILE='false'
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
B_MODULES_FILE='false' #
B_MOUNTS_FILE='false'
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
B_OS_RELEASE_FILE='false' # new default distro id file? will this one work where lsb-release didn't?
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
B_PARTITIONS_FILE='false' #
and some more variable ordering
2010-01-09 04:57:00 +00:00
B_PROC_DIR='false'
B_SCSI_FILE='false'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
(Change Version) Optimized to not do repeated tests of tools for functions that are used more than one time. Added boolean tested flags, and global app path variables to handle this. this can knock off up to 10 or more type -p app exists type tests for one script execution.
2010-01-29 23:31:20 +00:00
## app tested for and present, to avoid repeat tests
B_FILE_TESTED='false'
B_HDDTEMP_TESTED='false'
B_MODINFO_TESTED='false'
B_SUDO_TESTED='false'
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
### CONSTANTS/INITIALIZE - SOME MAY BE RESET LATER ###
patched, dcop in theory would now work in konversation script launch, otherwise I'll leave this alone for now
2008-10-29 02:35:42 +00:00
DCOPOBJ="default"
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
DEBUG=0 # Set debug levels from 1-10 (8-10 trigger logging levels)
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
# Debug Buffer Index, index into a debug buffer storing debug messages until inxi is 'all up'
DEBUG_BUFFER_INDEX=0
(Change Version) Final step: moved the error output switch to end of get_parameters. This lets you trigger the debugger -@ <debug number> flag without having to actually alter the code of inxi manually. This might occasionally create undesired error output, but that's a good thing, since that error output should be seen so we can know what the error is.
2008-11-11 19:34:25 +00:00
## note: the debugger rerouting to /dev/null has been moved to the end of the get_parameters function
## so -@[number] debug levels can be set if there is a failure, otherwise you can't even see the errors
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
SED_I='-i' # for gnu sed, will be set to -i '' for bsd sed
SED_RX='-r' # for gnu sed, will be set to -E for bsd sed for backward compatibility
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
# default to false, no konversation found, 1 is native konvi (qt3/KDE3) script mode, 2 is /cmd inxi start,
## 3 is Konversation > 1.2 (qt4/KDE4)
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
KONVI=0
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
# NO_CPU_COUNT=0 # Wether or not the string "dual" or similar is found in cpuinfo output. If so, avoid dups.
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
# This is a variable that controls how many parameters inxi will parse in a /proc/<pid>/cmdline file before stopping.
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
PARAMETER_LIMIT=30
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
SCHEME=0 # set default scheme - do not change this, it's set dynamically
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
# this is set in user prefs file, to override dynamic temp1/temp2 determination of sensors output in case
# cpu runs colder than mobo
SENSORS_CPU_NO=''
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
# SHOW_IRC=1 to avoid showing the irc client version number, or SHOW_IRC=0 to disable client information completely.
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
SHOW_IRC=2
comments tweak
2008-11-01 23:29:22 +00:00
# Verbosity level defaults to 0, this can also be set with -v0, -v2, -v3, etc as a parameter.
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
VERBOSITY_LEVEL=0
comments tweak
2008-11-01 23:29:22 +00:00
# Supported number of verbosity levels, including 0
added verbosity level 7, that addes -i and -xx
2011-07-08 21:16:19 +00:00
VERBOSITY_LEVELS=7
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
### LOGGING ###
## logging eval variables, start and end function: Insert to LOGFS LOGFE when debug level >= 8
LOGFS_STRING='log_function_data fs $FUNCNAME "$( echo $@ )"'
LOGFE_STRING='log_function_data fe $FUNCNAME'
LOGFS=''
LOGFE=''
# uncomment for debugging from script start
# LOGFS=$LOGFS_STRING
# LOGFE=$LOGFE_STRING
updated trunk inxi
2009-05-28 20:26:29 +00:00
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
### FILE NAMES/PATHS/URLS - must be non root writable ###
# File's used when present
FILE_ASOUND_DEVICE='/proc/asound/cards'
FILE_ASOUND_MODULES='/proc/asound/modules' # not used but maybe for -A?
FILE_ASOUND_VERSION='/proc/asound/version'
FILE_CPUINFO='/proc/cpuinfo'
FILE_DMESG_BOOT='/var/run/dmesg.boot'
FILE_LSB_RELEASE='/etc/lsb-release'
FILE_MDSTAT='/proc/mdstat'
FILE_MEMINFO='/proc/meminfo'
FILE_MODULES='/proc/modules'
FILE_MOUNTS='/proc/mounts'
FILE_OS_RELEASE='/etc/os-release'
FILE_PARTITIONS='/proc/partitions'
FILE_SCSI='/proc/scsi/scsi'
FILE_XORG_LOG='/var/log/Xorg.0.log' # if not found, search and replace with actual location
FILE_PATH=''
HDDTEMP_PATH=''
MODINFO_PATH=''
SUDO_PATH=''
Initial setup of repo
2008-10-28 00:40:43 +00:00
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
SCRIPT_DATA_DIR="$HOME/.inxi"
added debugging option -! ftp.<alternate ftp upload location> just so it's not restricted to ftp.techpatterns.com
2011-06-27 18:40:42 +00:00
ALTERNATE_FTP='' # for data uploads
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
ALTERNATE_WEATHER_LOCATION='' # weather alternate location
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
LOG_FILE="$SCRIPT_DATA_DIR/inxi.log"
LOG_FILE_1="$SCRIPT_DATA_DIR/inxi.1.log"
LOG_FILE_2="$SCRIPT_DATA_DIR/inxi.2.log"
updated inxi updater to get inxi.1.gz instead of inxi.8.gz, and also to mv man8/inxi.8.gz to man1/inxi.1.gz if detected. that should bring inxi back into sync with the methods of man.
2012-09-11 17:55:47 +00:00
MAN_FILE_DOWNLOAD='http://inxi.googlecode.com/svn/trunk/inxi.1.gz'
MAN_FILE_LOCATION='/usr/share/man/man1'
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
SCRIPT_NAME='inxi'
Added script patch number, this will show on update along with version number. Also if > 0, will show added to display version, like: 1.6.3-4 I've found that google svn from googlecode isn't propagating the data across its data centers quickly or consistently which makes testing and debugging a real pain in the butt when dealing with people in different geographical areas. Now we'll be able to confirm that you have dev version xx, ie, the latest uploaded, without doing pointless primary version number bumps. When patch number is 00, no display occurs, but it still shows on updating via -U
2011-06-09 20:09:41 +00:00
SCRIPT_PATCH_NUMBER=''
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
SCRIPT_PATH='' #filled-in in Main
updated trunk inxi
2009-05-28 20:26:29 +00:00
SCRIPT_VERSION_NUMBER="" #filled-in in Main
(Change Version) This is now launching inxi as an official script. Changed the default download url to get it directly from google svn. This means that users can always reference the official svn copy to ensure that the code is what it claims to be. Added for development purposes new advanced testing options: -! 1 triggers the boolean testing flag -! 2 triggers an alternative development download -! http://<any website>/path_to_download_directory/ (note: must end in /, and not include inxi file name Updated the script_self_updater function to handle variable download urls, and added an update message that lets the person know where the update source was. Added error handler for user provided testing download urls, if not existing, exit. And with this, I'm handing over control to the inxi project itself.
2008-11-11 18:37:09 +00:00
SCRIPT_DOWNLOAD='http://inxi.googlecode.com/svn/trunk/'
(change version) Added two new testing options, svn branch one and branch two download run from urls. Both are triggered by -!, -! 3 for testing branch/one and -! 4 for testing branch/two
2008-11-13 01:57:45 +00:00
SCRIPT_DOWNLOAD_BRANCH_1='http://inxi.googlecode.com/svn/branches/one/'
SCRIPT_DOWNLOAD_BRANCH_2='http://inxi.googlecode.com/svn/branches/two/'
added branches three and four support
2009-02-18 06:28:40 +00:00
SCRIPT_DOWNLOAD_BRANCH_3='http://inxi.googlecode.com/svn/branches/three/'
SCRIPT_DOWNLOAD_BRANCH_4='http://inxi.googlecode.com/svn/branches/four/'
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
SCRIPT_DOWNLOAD_BRANCH_BSD='http://inxi.googlecode.com/svn/branches/bsd/'
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
SCRIPT_DOWNLOAD_BRANCH_GNUBSD='http://inxi.googlecode.com/svn/branches/gnubsd/'
(Version Change) Added 32/64 bit output on System -S line
2008-12-17 04:09:01 +00:00
SCRIPT_DOWNLOAD_DEV='http://smxi.org/test/'
added feature where a different ip page can be added by whoever. That would need to be set in the inxi override config file. The page must show only one line of output, and that last item on that line must be the ip address. Ok, that's it, not a big deal, but some people may prefer a non smxi ip address page for whatever reason, so have at it. Or not.
2012-04-16 18:06:13 +00:00
# note, you can use any ip url here as long as it's the only line on the output page.
# Also the ip address must be the last thing on that line.
WAN_IP_URL='http://smxi.org/opt/ip.php'
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
KONVI_CFG="konversation/scripts/$SCRIPT_NAME.conf" # relative path to $(kde-config --path data)
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
### INITIALIZE VARIABLES NULL ###
BSD_TYPE=''
BSD_VERSION=
CMDL_MAX=''
DEV_DISK_ID=''
DEV_DISK_LABEL=''
DEV_DISK_MAPPER=''
DEV_DISK_UUID=''
DMIDECODE_DATA=''
IRC_CLIENT=''
IRC_CLIENT_VERSION=''
PS_THROTTLED=''
REPO_DATA=''
### LAYOUT ###
# These two determine separators in single line output, to force irc clients not to break off sections
SEP1='~'
SEP2=' '
# these will assign a separator to non irc states. Important! Using ':' can trigger stupid emoticon
# behaviors in output on IRC, so do not use those.
SEP3_IRC=''
SEP3_CONSOLE=':'
SEP3='' # do not set, will be set dynamically
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
LINE1='---------------------------------------------------------------------------'
LINE2='- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -'
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
# Default indentation level. NOTE: actual indent is 1 greater to allow for spacing
INDENT=10
### COLUMN WIDTHS ###
COLS_INNER='' ## for width minus INDENT
COLS_MAX=''
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# these will be set dynamically in main()
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
TERM_COLUMNS=80
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
TERM_LINES=100
# Only for legacy user config files se we can test and convert the var name
LINE_MAX_CONSOLE=''
LINE_MAX_IRC=''
### COLORS ###
# Defaults to 2, make this 1 for normal, 0 for no colorcodes at all. Use following variables in config
# files to change defaults for each type, or global
# Same as runtime parameter.
DEFAULT_COLOR_SCHEME=2
## color variables - set dynamically
COLOR_SCHEME=''
C1=''
C2=''
CN=''
## Always leave these blank, these are only going to be set in inxi.conf files, that makes testing
## for user changes easier after sourcing the files
GLOBAL_COLOR_SCHEME=''
IRC_COLOR_SCHEME=''
IRC_CONS_COLOR_SCHEME=''
IRC_X_TERM_COLOR_SCHEME=''
CONSOLE_COLOR_SCHEME=''
VIRT_TERM_COLOR_SCHEME=''
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
## Output colors
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
# A more elegant way to have a scheme that doesn't print color codes (neither ANSI nor mIRC) at all. See below.
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
unset EMPTY
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
# DGREY BLACK RED DRED GREEN DGREEN YELLOW DYELLOW
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
ANSI_COLORS="       "
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
IRC_COLORS=" \x0314 \x0301 \x0304 \x0305 \x0309 \x0303 \x0308 \x0307"
# BLUE DBLUE MAGENTA DMAGENTA CYAN DCYAN WHITE GREY NORMAL
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
ANSI_COLORS="$ANSI_COLORS         "
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
IRC_COLORS=" $IRC_COLORS \x0312 \x0302 \x0313 \x0306 \x0311 \x0310 \x0300 \x0315 \x03"
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
#ANSI_COLORS=($ANSI_COLORS); IRC_COLORS=($IRC_COLORS)
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
A_COLORS_AVAILABLE=( DGREY BLACK RED DRED GREEN DGREEN YELLOW DYELLOW BLUE DBLUE MAGENTA DMAGENTA CYAN DCYAN WHITE GREY NORMAL )
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
Initial setup of repo
2008-10-28 00:40:43 +00:00
# See above for notes on EMPTY
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
## note: group 1: 0, 1 are null/normal
## Following: group 2: generic, light/dark or dark/light; group 3: dark on light; group 4 light on dark;
fixed color schemes to only show safe dark/light group for irc or global color picker. This solves the problem of unreadable output for some irc viewers Also added output to color picker to show what selection was. Note: I changed some of the colors so the old selections won't be the same, so please update version package maintainers
2011-04-30 18:35:54 +00:00
# this is the count of the first two groups, starting at zero
SAFE_COLOR_COUNT=12
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
A_COLOR_SCHEMES=(
EMPTY,EMPTY,EMPTY
NORMAL,NORMAL,NORMAL
BLUE,NORMAL,NORMAL
fixed color schemes to only show safe dark/light group for irc or global color picker. This solves the problem of unreadable output for some irc viewers Also added output to color picker to show what selection was. Note: I changed some of the colors so the old selections won't be the same, so please update version package maintainers
2011-04-30 18:35:54 +00:00
BLUE,RED,NORMAL
CYAN,BLUE,NORMAL
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
DCYAN,NORMAL,NORMAL
fixed color schemes to only show safe dark/light group for irc or global color picker. This solves the problem of unreadable output for some irc viewers Also added output to color picker to show what selection was. Note: I changed some of the colors so the old selections won't be the same, so please update version package maintainers
2011-04-30 18:35:54 +00:00
DCYAN,BLUE,NORMAL
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
DGREEN,NORMAL,NORMAL
DYELLOW,NORMAL,NORMAL
fixed color schemes to only show safe dark/light group for irc or global color picker. This solves the problem of unreadable output for some irc viewers Also added output to color picker to show what selection was. Note: I changed some of the colors so the old selections won't be the same, so please update version package maintainers
2011-04-30 18:35:54 +00:00
GREEN,DGREEN,NORMAL
GREEN,NORMAL,NORMAL
MAGENTA,NORMAL,NORMAL
RED,NORMAL,NORMAL
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
BLACK,DGREY,NORMAL
DBLUE,DGREY,NORMAL
DBLUE,DMAGENTA,NORMAL
DBLUE,DRED,NORMAL
DBLUE,BLACK,NORMAL
DGREEN,DYELLOW,NORMAL
DYELLOW,BLACK,NORMAL
DMAGENTA,BLACK,NORMAL
DCYAN,DBLUE,NORMAL
WHITE,GREY,NORMAL
GREY,WHITE,NORMAL
CYAN,GREY,NORMAL
GREEN,WHITE,NORMAL
GREEN,YELLOW,NORMAL
YELLOW,WHITE,NORMAL
MAGENTA,CYAN,NORMAL
MAGENTA,YELLOW,NORMAL
RED,CYAN,NORMAL
RED,WHITE,NORMAL
whoops, better add it after to not break existing ones
2011-05-07 02:49:20 +00:00
BLUE,WHITE,NORMAL
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
)
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
# WARNING: In the main part below (search for 'KONVI')
# there's a check for Konversation-specific config files.
# Any one of these can override the above if inxi is run
# from Konversation!
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
## DISTRO DATA/ID ##
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
# In cases of derived distros where the version file of the base distro can also be found under /etc,
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
# the derived distro's version file should go first. (Such as with Sabayon / Gentoo)
This does not have a new version number (there is a new date), and is only for solusos, so all other distro maintainer can ignore this update. New tarball. Adds support for solusos-release distro file in /etc/.
2013-09-10 17:51:12 +00:00
DISTROS_DERIVED="antix-version aptosid-version kanotix-version knoppix-version mandrake-release pardus-release sabayon-release siduction-version sidux-version solusos-release turbolinux-release zenwalk-version"
more refactoring and code cleanup, it's starting to get readable now
2008-10-28 03:01:58 +00:00
# debian_version excluded from DISTROS_PRIMARY so Debian can fall through to /etc/issue detection. Same goes for Ubuntu.
Added proper antix-version handling to get distro name
2008-11-03 20:41:39 +00:00
DISTROS_EXCLUDE_LIST="debian_version ubuntu_version"
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
DISTROS_PRIMARY="arch-release gentoo-release redhat-release slackware-version SuSE-release"
lsb fix for distros with known good lsb files
2008-12-20 18:52:54 +00:00
DISTROS_LSB_GOOD="mandrake-release mandriva-release mandrakelinux-release"
This does not have a new version number (there is a new date), and is only for solusos, so all other distro maintainer can ignore this update. New tarball. Adds support for solusos-release distro file in /etc/.
2013-09-10 17:51:12 +00:00
# this is being used both by core distros and derived distros now, eg, solusos 1 uses it for solusos id, while
added some logging, again, nothing worth a version bump, but a new tarball anyway.
2012-12-20 20:29:02 +00:00
# debian, solusos base, uses it as well, so we have to know which it is.
first patch attempt for inxi suse id, that uses os-release by default now
2012-11-17 21:48:36 +00:00
DISTROS_OS_RELEASE_GOOD="arch-release SuSE-release"
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
## Distros with known problems
# DSL (Bash 2.05b: grep -m doesn't work; arrays won't work) --> unusable output
# Puppy Linux 4.1.2 (Bash 3.0: arrays won't work) --> works partially
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
## OUTPUT FILTERS/SEARCH ##
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
# Note that \<ltd\> bans only words, not parts of strings; in \<corp\> you can't use punctuation characters like . or ,
tried a bit more optimization for -G, but it turns out it's glxinfo itself that is slow, so the only way to really get -G sped up is to redo the way inxi gets the glxinfo data.
2011-06-21 00:58:51 +00:00
# we're saving about 10+% of the total script exec time by hand building the ban lists here, using hard quotes.
added more debugging data collection for lspci output types, might be able to get better support for failed machine type and other data types.
2014-03-21 22:33:51 +00:00
BAN_LIST_NORMAL='chipset|components|computing|computer|corporation|communications|electronics|electrical|electric|gmbh|group|incorporation|industrial|international|nee|revision|semiconductor|software|technologies|technology|ltd\.|\<ltd\>|inc\.|\<inc\>|intl\.|co\.|\<co\>|corp\.|\<corp\>|\(tm\)|\(r\)|®|\(rev ..\)'
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
BAN_LIST_CPU='@|cpu deca|dual core|dual-core|tri core|tri-core|quad core|quad-core|ennea|genuine|hepta|hexa|multi|octa|penta|processor|single|triple|[0-9\.]+ *[MmGg][Hh][Zz]'
more refactoring
2008-10-29 03:03:18 +00:00
updated sensors to handle gpu data more cleanly.
2011-06-25 17:08:57 +00:00
SENSORS_GPU_SEARCH='intel|radeon|nouveau'
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
### USB networking search string data, because some brands can have other products than
### wifi/nic cards, they need further identifiers, with wildcards.
more fine tunings of usb detections
2011-04-30 22:43:44 +00:00
### putting the most common and likely first, then the less common, then some specifics
New version, new tarball. Fixed a bug / issue with failed usb nic detection, amazingly, the regex in inxi failed to check for Ethernet.*Adapter, heh. Most usb nics are wifi, so I guess ethernet just escaped me.
2013-08-20 19:28:02 +00:00
USB_NETWORK_SEARCH="Wi-Fi.*Adapter|Wireless.*Adapter|Ethernet.*Adapter|WLAN.*Adapter|Network.*Adapter|802\.11|Atheros|Atmel|D-Link.*Adapter|D-Link.*Wireless|Linksys|Netgea|Ralink|Realtek.*Network|Realtek.*Wireless|Realtek.*WLAN|Belkin.*Wireless|Belkin.*WLAN|Belkin.*Network"
bug fix, first patch, usb networking wasn't working, not sure why this was never reported
2011-11-22 06:31:28 +00:00
USB_NETWORK_SEARCH="$USB_NETWORK_SEARCH|Actiontec.*Wireless|Actiontec.*Network|AirLink.*Wireless|Asus.*Network|Asus.*Wireless|Buffalo.*Wireless|Davicom|DWA-.*RangeBooster|DWA-.*Wireless|ENUWI-.*Wireless|LG.*Wi-Fi|Rosewill.*Wireless|RNX-.*Wireless|Samsung.*LinkStick|Samsung.*Wireless|Sony.*Wireless|TEW-.*Wireless|TP-Link.*Wireless|WG[0-9][0-9][0-9].*Wireless|WNA[0-9][0-9][0-9]|WNDA[0-9][0-9][0-9]|Zonet.*ZEW.*Wireless|54 Mbps"
more fine tuning for usb detection
2011-04-30 22:32:39 +00:00
# then a few known hard to ID ones added
bug fix, simple, but requires a version update to force upgrades otherwise -N doesn't work right
2011-05-01 16:31:32 +00:00
# belkin=050d; d-link=07d1; netgear=0846; ralink=148f; realtek=0bda;
updated sensors to handle gpu data more cleanly.
2011-06-25 17:08:57 +00:00
USB_NETWORK_SEARCH="$USB_NETWORK_SEARCH|050d:935b|0bda:8189|0bda:8197"
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
########################################################################
#### MAIN: Where it all begins
########################################################################
main()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
Still a gawk bug loomed. Fixed now. inxi will exit in Ubuntu with gawk requirement only now. (or any other distro gawk-less).
2009-05-28 23:48:35 +00:00
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
local color_scheme=''
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
# this will be used by all functions following
local Ps_aux_Data="$( ps aux )"
New version, tarball. Fixed a small issue that would create a wrong reporting of disk useage if bind mounts are used, ie, multiple binds to a single mount. Now inxi will check a list of the previously used partitions before adding the size of the used space to the total used, if the partition has already been used it will skip it. This was/is a quick and dirty fix, but it's totally fine I believe and should resolve two separate issues: 1. use of bind mount method, where multiple partition names are bound to the same partition 2. accidental dual mounting to the same partition. partitions section will still show the same data, ie, if bind is used, it will show all the bind mounts even when they are attached/bound to a partition that is already listed. This seems useful information, though maybe we can get the key word 'bind' in there somehow, but for now I won't worry about that issue, that's just a nice to have, not a bug.
2013-05-03 20:57:40 +00:00
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
# This function just initializes variables
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
initialize_data
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
# Source global config overrides, needs to be here because some things
# can be reset that were set in initialize, but check_required_apps needs
if [[ -s /etc/$SCRIPT_NAME.conf ]];then
source /etc/$SCRIPT_NAME.conf
fi
# Source user config variables override /etc/inxi.conf variables
if [[ -s $HOME/.$SCRIPT_NAME/$SCRIPT_NAME.conf ]];then
source $HOME/.$SCRIPT_NAME/$SCRIPT_NAME.conf
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
## sometimes tput will trigger an error (mageia) if irc client
if [[ $B_IRC == 'false' ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p tput &>/dev/null;then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
TERM_COLUMNS=$(tput cols)
TERM_LINES=$(tput lines)
fi
# double check, just in case it's missing functionality or whatever
if [[ -n ${TERM_COLUMNS##[0-9]*} ]];then
TERM_COLUMNS=80
TERM_LINES=100
fi
fi
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
# Convert to new variable names if set in config files, legacy test
if [[ -n $LINE_MAX_CONSOLE ]];then
COLS_MAX_CONSOLE=$LINE_MAX_CONSOLE
fi
if [[ -n $LINE_MAX_IRC ]];then
COLS_MAX_IRC=$LINE_MAX_IRC
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# this lets you set different widths for in or out of display server
# if [[ $B_RUNNING_IN_DISPLAY == 'false' && -n $COLS_MAX_NO_DISPLAY ]];then
# COLS_MAX_CONSOLE=$COLS_MAX_NO_DISPLAY
# fi
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
# TERM_COLUMNS is set in top globals, using tput cols
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# echo tc: $TERM_COLUMNS cmc: $COLS_MAX_CONSOLE
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
if [[ $TERM_COLUMNS -lt $COLS_MAX_CONSOLE ]];then
COLS_MAX_CONSOLE=$TERM_COLUMNS
fi
# adjust, some terminals will wrap if output cols == term cols
COLS_MAX_CONSOLE=$(( $COLS_MAX_CONSOLE - 2 ))
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# echo cmc: $COLS_MAX_CONSOLE
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
# comes after source for user set stuff
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'false' ]];then
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
COLS_MAX=$COLS_MAX_CONSOLE
else
COLS_MAX=$COLS_MAX_IRC
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
# echo SCHEME $SCHEME
# echo B_IRC $B_IRC
# echo sep3: $SEP3
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
COLS_INNER=$(( $COLS_MAX - $INDENT - 1 ))
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# echo cm: $COLS_MAX ci: $COLS_INNER
updated trunk inxi
2009-05-28 20:26:29 +00:00
# Check for dependencies BEFORE running ANYTHING else except above functions
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
# Not all distro's have these depends installed by default. Don't want to run
# this if the user is requesting to see this information in the first place
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
# Only continue if required apps tests ok
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
if [[ $1 != '--recommends' ]];then
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
check_required_apps
check_recommended_apps
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
fi
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
SCRIPT_VERSION_NUMBER=$( parse_version_data 'main' )
SCRIPT_PATCH_NUMBER=$( parse_version_data 'patch' )
updated trunk inxi
2009-05-28 20:26:29 +00:00
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
# previous source location, check for bugs
updated trunk inxi
2009-05-28 20:26:29 +00:00
## this needs to run before the KONVI stuff is set below
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
## Konversation 1.2 apparently does not like the $PPID test in get_start_client
## So far there is no known way to detect if qt4_konvi is the parent process
## this method will infer qt4_konvi as parent
updated trunk inxi
2009-05-28 20:26:29 +00:00
get_start_client
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# note: this only works if it's run from inside konversation as a script builtin or something
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
# only do this if inxi has been started as a konversation script, otherwise bypass this
# KONVI=3 ## for testing puroses
if [[ $KONVI -eq 1 || $KONVI -eq 3 ]];then
if [[ $KONVI -eq 1 ]]; then ## dcop Konversation (ie 1.x < 1.2(qt3))
DCPORT="$1"
DCSERVER="$2"
DCTARGET="$3"
shift 3
elif [[ $KONVI -eq 3 ]]; then ## dbus Konversation (> 1.2 (qt4))
DCSERVER="$1" ##dbus testing
DCTARGET="$2" ##dbus testing
shift 2
fi
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# The section below is on request of Argonel from the Konversation developer team:
# it sources config files like $HOME/.kde/share/apps/konversation/scripts/inxi.conf
IFS=":"
for kde_config in $( kde-config --path data )
do
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ -r $kde_config$KONVI_CFG ]];then
source "$kde_config$KONVI_CFG"
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
break
fi
done
IFS="$ORIGINAL_IFS"
fi
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
## leave this for debugging dcop stuff if we get that working
# print_screen_output "DCPORT: $DCPORT"
# print_screen_output "DCSERVER: $DCSERVER"
# print_screen_output "DCTARGET: $DCTARGET"
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
# first init function must be set first for colors etc. Remember, no debugger
# stuff works on this function unless you set the debugging flag manually.
# Debugging flag -@ [number] will not work until get_parameters runs.
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# "$@" passes every parameter separately quoted, "$*" passes all parameters as one quoted parameter.
# must be here to allow debugger and other flags to be set.
get_parameters "$@"
# If no colorscheme was set in the parameter handling routine, then set the default scheme
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
if [[ $B_COLOR_SCHEME_SET != 'true' ]];then
# This let's user pick their color scheme. For IRC, only shows the color schemes, no interactive
# The override value only will be placed in user config files. /etc/inxi.conf can also override
if [[ $B_RUN_COLOR_SELECTOR == 'true' ]];then
select_default_color_scheme
else
# set the default, then override as required
color_scheme=$DEFAULT_COLOR_SCHEME
if [[ -n $GLOBAL_COLOR_SCHEME ]];then
color_scheme=$GLOBAL_COLOR_SCHEME
else
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'false' ]];then
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
if [[ -n $CONSOLE_COLOR_SCHEME && -z $DISPLAY ]];then
color_scheme=$CONSOLE_COLOR_SCHEME
elif [[ -n $VIRT_TERM_COLOR_SCHEME ]];then
color_scheme=$VIRT_TERM_COLOR_SCHEME
fi
else
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ -n $IRC_X_TERM_COLOR_SCHEME && $B_CONSOLE_IRC == 'true' && -n $B_RUNNING_IN_DISPLAY ]];then
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
color_scheme=$IRC_X_TERM_COLOR_SCHEME
elif [[ -n $IRC_CONS_COLOR_SCHEME && -z $DISPLAY ]];then
color_scheme=$IRC_CONS_COLOR_SCHEME
elif [[ -n $IRC_COLOR_SCHEME ]];then
color_scheme=$IRC_COLOR_SCHEME
fi
fi
fi
set_color_scheme $color_scheme
fi
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
if [[ $B_IRC == 'false' ]];then
SEP3=$SEP3_CONSOLE
else
# too hard to read if no colors, so force that for users on irc
if [[ $SCHEME == 0 ]];then
SEP3=$SEP3_CONSOLE
else
SEP3=$SEP3_IRC
fi
fi
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# all the pre-start stuff is in place now
B_SCRIPT_UP='true'
script_debugger "Debugger: $SCRIPT_NAME is up and running..."
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# then create the output
print_it_out
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# weechat's executor plugin forced me to do this, and rightfully so, because else the exit code
# from the last command is taken..
exit 0
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
}
#### -------------------------------------------------------------------
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
#### basic tests: set script data, booleans, PATH, version numbers
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
#### -------------------------------------------------------------------
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# Set PATH data so we can access all programs as user. Set BAN lists.
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
# initialize some boleans, these directories are used throughout the script
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# some apps are used for extended functions any directory used, should be
# checked here first.
updated trunk inxi
2009-05-28 20:26:29 +00:00
# No args taken.
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
initialize_data()
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
BSD_VERSION=$( uname -s 2>/dev/null | tr '[A-Z]' '[a-z]' )
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
# note: archbsd says they are a freebsd distro, so assuming it's the same as freebsd
New version: fixed an old bug, with -c 0, no colors, RED and NORMAL color codes were not set to null, which results in some cases with red output, along with turning terminal/console font color red.
2014-03-26 19:46:58 +00:00
if [[ -z ${BSD_VERSION/*bsd*/} ]];then
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# GNU/kfreebsd will by definition have GNU tools like sed/grep
New version: fixed an old bug, with -c 0, no colors, RED and NORMAL color codes were not set to null, which results in some cases with red output, along with turning terminal/console font color red.
2014-03-26 19:46:58 +00:00
if [[ -z ${BSD_VERSION/*kfreebsd*/} ]];then
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
BSD_TYPE='debian-bsd' # debian gnu bsd
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
else
BSD_TYPE='bsd' # all other bsds
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
SED_I="-i ''"
SED_RX='-E'
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
fi
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
fi
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# now set the script BOOLEANS for files required to run features
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
# note that freebsd has /proc but it's empty
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ -d "/proc/" && -z $BSD_TYPE ]];then
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
B_PROC_DIR='true'
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
elif [[ -n $BSD_TYPE ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
B_PROC_DIR='false'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
else
error_handler 6
fi
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
initialize_paths
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
if [[ -n $BSD_TYPE ]];then
if [[ -e $FILE_DMESG_BOOT ]];then
B_DMESG_BOOT_FILE='true'
fi
else
# found a case of battery existing but having nothing in it on desktop mobo
# not all laptops show the first,
if [[ -n $( ls /proc/acpi/battery 2>/dev/null ) ]];then
B_PORTABLE='true'
fi
more bug fixes, simplified logic
2011-06-08 06:17:03 +00:00
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_CPUINFO ]]; then
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
B_CPUINFO_FILE='true'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_MEMINFO ]];then
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
B_MEMINFO_FILE='true'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_ASOUND_DEVICE ]];then
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
B_ASOUND_DEVICE_FILE='true'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_ASOUND_VERSION ]];then
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
B_ASOUND_VERSION_FILE='true'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -f $FILE_LSB_RELEASE ]];then
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
B_LSB_FILE='true'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
fi
added to data collector /etc/os-release
2012-07-22 00:25:04 +00:00
if [[ -f $FILE_OS_RELEASE ]];then
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
B_OS_RELEASE_FILE='true'
added to data collector /etc/os-release
2012-07-22 00:25:04 +00:00
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_SCSI ]];then
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
B_SCSI_FILE='true'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
fi
if [[ -n $DISPLAY ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
B_SHOW_DISPLAY_DATA='true'
B_RUNNING_IN_DISPLAY='true'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
fi
Added man pages, including the gz part. No idea why I forgot to do this, this is by aus9 by the way. So there's the man pages, needs some work, but at least it's something.
2012-05-06 23:38:13 +00:00
if [[ -e $FILE_MDSTAT ]];then
B_MDSTAT_FILE='true'
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_MODULES ]];then
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
B_MODULES_FILE='true'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_MOUNTS ]];then
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
B_MOUNTS_FILE='true'
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_PARTITIONS ]];then
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
B_PARTITIONS_FILE='true'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
fi
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
# default to the normal location, then search for it
if [[ -e $FILE_XORG_LOG ]];then
B_XORG_LOG='true'
else
# Detect location of the Xorg log file
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p xset &>/dev/null; then
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
FILE_XORG_LOG=$( xset q 2>/dev/null | grep -i 'Log file' | gawk '{print $3}')
if [[ -e $FILE_XORG_LOG ]];then
B_XORG_LOG='true'
fi
fi
fi
(Change Version) Fixed long standing bug with root user getting null output for res or tty, now if in X, shows message that gfx data is not available to root. Also added null case handling for some of the gfx output to show N/A instead of null. This lets me know which detection fails, which should make debugging a bit easier long term. Turned off the advanced glx info line as well for root user.
2009-03-16 19:41:11 +00:00
# gfx output will require this flag
if [[ $( whoami ) == 'root' ]];then
B_ROOT='true'
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
}
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
# arg: $1 - version number: main/patch/date
parse_version_data()
{
local version_data=''
# note, using ####[[:space:]]+ to avoid having this function also trip the version datas
case $1 in
date)
version_data="$( gawk -F ': ' '
/####[[:space:]]+Date:/ {
print $NF
}' $SCRIPT_PATH/$SCRIPT_NAME )"
;;
main)
version_data="$( gawk '
/####[[:space:]]+Version:/ {
print $3
}' $SCRIPT_PATH/$SCRIPT_NAME )"
;;
patch)
version_data="$( gawk '
/####[[:space:]]+Patch Number:/ {
print $4
}' $SCRIPT_PATH/$SCRIPT_NAME )"
;;
esac
echo $version_data
}
initialize_paths()
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
{
local path='' added_path='' b_path_found='' sys_path=''
# Extra path variable to make execute failures less likely, merged below
local extra_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
# this needs to be set here because various options call the parent initialize function directly.
SCRIPT_PATH=$( dirname $0 )
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
# Fallback paths put into $extra_paths; This might, among others, help on gentoo.
# Now, create a difference of $PATH and $extra_paths and add that to $PATH:
IFS=":"
for path in $extra_paths
do
b_path_found='false'
for sys_path in $PATH
do
if [[ $path == $sys_path ]];then
b_path_found='true'
fi
done
if [[ $b_path_found == 'false' ]];then
added_path="$added_path:$path"
fi
done
IFS="$ORIGINAL_IFS"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
PATH="$PATH$added_path"
New version. Some BSD fixes, and a more important fix, added 'display controller' to graphics card detection, that's a new one on me. Dual card systems might use this. 00:02.0 Display controller: Intel Corporation 82865G Integrated Graphics Controller (rev 02) 01:00.0 VGA compatible controller: NVIDIA Corporation NV44A [GeForce 6200] (rev a1) Some more switches to bash native methods as well.
2014-03-18 02:26:26 +00:00
# echo "PATH='$PATH'"
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
##/bin/sh -c 'echo "PATH in subshell=\"$PATH\""'
}
updated trunk inxi
2009-05-28 20:26:29 +00:00
# No args taken.
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
check_recommended_apps()
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
local bash_array_test=( "one" "two" )
# check for array ability of bash, this is only good for the warning at this time
# the boolean could be used later
# bash version 2.05b is used in DSL
updated trunk inxi
2009-05-28 20:26:29 +00:00
# bash version 3.0 is used in Puppy Linux; it has a known array bug <reference to be placed here>
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
# versions older than 3.1 don't handle arrays
# distro's using below 2.05b are unknown, released in 2002
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
if [[ ${bash_array_test[1]} -eq "two" ]];then
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
B_BASH_ARRAY='true'
else
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
script_debugger "Suggestion: update to Bash v3.1 for optimal inxi output"
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
fi
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
# test for a few apps that bsds may not have after initial tests
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p lspci &>/dev/null;then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
B_LSPCI='true'
fi
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ -n $BSD_TYPE ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p sysctl &>/dev/null;then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
B_SYSCTL='true'
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p pciconf &>/dev/null;then
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
B_PCICONF='true'
fi
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
fi
Change version: Bug fix, added in globals B_DCOP / B_QDBUS for pretests of dcop/qdbus. Need to set both because some systems have both. Bug fix, added squashfs and unionfs to excluded fs types to clean up -p output for partition data
2010-06-11 03:44:19 +00:00
# now setting qdbus/dcop for first run, some systems can have both by the way
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p qdbus &>/dev/null;then
Change version: Bug fix, added in globals B_DCOP / B_QDBUS for pretests of dcop/qdbus. Need to set both because some systems have both. Bug fix, added squashfs and unionfs to excluded fs types to clean up -p output for partition data
2010-06-11 03:44:19 +00:00
B_QDBUS='true'
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p dcop &>/dev/null;then
Change version: Bug fix, added in globals B_DCOP / B_QDBUS for pretests of dcop/qdbus. Need to set both because some systems have both. Bug fix, added squashfs and unionfs to excluded fs types to clean up -p output for partition data
2010-06-11 03:44:19 +00:00
B_DCOP='true'
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
}
# Determine if any of the absolutely necessary tools are absent
updated trunk inxi
2009-05-28 20:26:29 +00:00
# No args taken.
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
check_required_apps()
'yeah' somehow jumped in. Removed before allowing updates. Should be find now.
2009-07-08 03:52:13 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
local app_name=''
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
# bc removed from deps for now
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
local depends="df gawk grep ps readlink tr uname uptime wc"
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ -z $BSD_TYPE ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
depends="$depends lspci"
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
elif [[ $BSD_TYPE == 'bsd' ]];then
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
depends="$depends sysctl"
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
# debian-bsd has lspci but you must be root to run it
elif [[ $BSD_TYPE == 'debian-bsd' ]];then
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
depends="$depends sysctl lspci"
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
fi
added comments, updated help to show desktop for S
2011-05-19 00:23:29 +00:00
# no need to add xprop because it will just give N/A if not there, but if we expand use of xprop,
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
# should add that here as a test, then use the B_SHOW_DISPLAY_DATA flag to trigger the tests in de function
added comments, updated help to show desktop for S
2011-05-19 00:23:29 +00:00
local x_apps="xrandr xdpyinfo glxinfo"
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ $B_RUNNING_IN_DISPLAY == 'true' ]];then
updated trunk inxi
2009-05-28 20:26:29 +00:00
for app_name in $x_apps
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
do
New version, serious bug fix, do NOT use 2.1.4, it will fail to start. Bad copy/paste.
2014-03-18 08:32:31 +00:00
if ! type -p $app_name &>/dev/null;then
text tweak
2011-06-10 23:25:13 +00:00
script_debugger "Resuming in non X mode: $app_name not found. For package install advice run: $SCRIPT_NAME --recommends"
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
B_SHOW_DISPLAY_DATA='false'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
break
fi
done
fi
app_name=''
for app_name in $depends
do
New version, serious bug fix, do NOT use 2.1.4, it will fail to start. Bad copy/paste.
2014-03-18 08:32:31 +00:00
if ! type -p $app_name &>/dev/null;then
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
error_handler 5 "$app_name"
fi
done
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
}
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
## note: this is now running inside each gawk sequence directly to avoid exiting gawk
## looping in bash through arrays, then re-entering gawk to clean up, then writing back to array
## in bash. For now I'll leave this here because there's still some interesting stuff to get re methods
# Enforce boilerplate and buzzword filters
# args: $1 - BAN_LIST_NORMAL/BAN_LIST_CPU; $2 - string to sanitize
sanitize_characters()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# Cannot use strong quotes to unquote a string with pipes in it!
# bash will interpret the |'s as usual and try to run a subshell!
# Using weak quotes instead, or use '"..."'
echo "$2" | gawk "
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
}
{
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
gsub(/${!1}/,\"\")
gsub(/ [ ]+/,\" \") ## ([ ]+) with (space)
gsub(/^ +| +$/,\"\") ## (pipe char) with (nothing)
print ## prints (returns) cleaned input
}"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
}
# Set the colorscheme
# args: $1 = <scheme number>|<"none">
set_color_scheme()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
local i='' a_output_colors='' a_color_codes=''
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
if [[ $1 -ge ${#A_COLOR_SCHEMES[@]} ]];then
set -- 1
fi
# Set a global variable to allow checking for chosen scheme later
SCHEME="$1"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'false' ]];then
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
a_color_codes=( $ANSI_COLORS )
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
else
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
a_color_codes=( $IRC_COLORS )
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
fi
for (( i=0; i < ${#A_COLORS_AVAILABLE[@]}; i++ ))
do
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
eval "${A_COLORS_AVAILABLE[i]}=\"${a_color_codes[i]}\""
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
done
IFS=","
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
a_output_colors=( ${A_COLOR_SCHEMES[$1]} )
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
IFS="$ORIGINAL_IFS"
# then assign the colors globally
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
C1="${!a_output_colors[0]}"
C2="${!a_output_colors[1]}"
CN="${!a_output_colors[2]}"
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# ((COLOR_SCHEME++)) ## note: why is this? ##
New version: fixed an old bug, with -c 0, no colors, RED and NORMAL color codes were not set to null, which results in some cases with red output, along with turning terminal/console font color red.
2014-03-26 19:46:58 +00:00
# handle some explicit colors that are used for no color 0
if [[ $SCHEME -eq 0 ]];then
NORMAL=''
RED=''
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
}
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
select_default_color_scheme()
{
eval $LOGFS
local spacer=' ' options='' user_selection='' config_variable=''
local config_file="$HOME/.$SCRIPT_NAME/$SCRIPT_NAME.conf"
fixed color schemes to only show safe dark/light group for irc or global color picker. This solves the problem of unreadable output for some irc viewers Also added output to color picker to show what selection was. Note: I changed some of the colors so the old selections won't be the same, so please update version package maintainers
2011-04-30 18:35:54 +00:00
local irc_clear=""
local irc_gui='Unset' irc_console='Unset' irc_x_term='Unset'
local console='Unset' virt_term='Unset' global='Unset'
if [[ -n $IRC_COLOR_SCHEME ]];then
irc_gui="Set: $IRC_COLOR_SCHEME"
fi
if [[ -n $IRC_CONS_COLOR_SCHEME ]];then
irc_console="Set: $IRC_CONS_COLOR_SCHEME"
fi
if [[ -n $IRC_X_TERM_COLOR_SCHEME ]];then
irc_x_term="Set: $IRC_X_TERM_COLOR_SCHEME"
fi
if [[ -n $VIRT_TERM_COLOR_SCHEME ]];then
virt_term="Set: $VIRT_TERM_COLOR_SCHEME"
fi
if [[ -n $CONSOLE_COLOR_SCHEME ]];then
console="Set: $CONSOLE_COLOR_SCHEME"
fi
if [[ -n $GLOBAL_COLOR_SCHEME ]];then
global="Set: $GLOBAL_COLOR_SCHEME"
fi
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
# don't want these printing in irc since they show literally
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'true' ]];then
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
irc_clear=''
fi
# first make output neutral so it's just plain default for console client
set_color_scheme "0"
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
# print_lines_basic "0" "" ""
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'false' ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "Welcome to $SCRIPT_NAME! Please select the default $COLOR_SELECTION color scheme."
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
# print_screen_output "You will see this message only one time per user account, unless you set preferences in: /etc/$SCRIPT_NAME.conf"
print_screen_output " "
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "Because there is no way to know your $COLOR_SELECTION foreground/background colors, you can set your color preferences from color scheme option list below. 0 is no colors, 1 neutral. After these, there are 3 sets: 1-dark or light backgrounds; 2-light backgrounds; 3-dark backgrounds."
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'false' ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "Please note that this will set the $COLOR_SELECTION preferences only for user: $(whoami)"
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_screen_output "$LINE1"
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
for (( i=0; i < ${#A_COLOR_SCHEMES[@]}; i++ ))
do
if [[ $i -gt 9 ]];then
spacer=' '
fi
fixed color schemes to only show safe dark/light group for irc or global color picker. This solves the problem of unreadable output for some irc viewers Also added output to color picker to show what selection was. Note: I changed some of the colors so the old selections won't be the same, so please update version package maintainers
2011-04-30 18:35:54 +00:00
# only offer the safe universal defaults
case $COLOR_SELECTION in
global|irc|irc-console|irc-virtual-terminal)
if [[ $i -gt $SAFE_COLOR_COUNT ]];then
break
fi
;;
esac
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
set_color_scheme $i
print_screen_output "$irc_clear $i)$spacer${C1}Card:${C2} nVidia G86 [GeForce 8400 GS] ${C1}X.Org${C2} 1.7.7"
done
set_color_scheme 0
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'false' ]];then
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
echo -n ""
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
fixed spacing on selector
2011-04-30 18:46:03 +00:00
print_screen_output "$irc_clear $i)${spacer}Remove all color settings. Restore $SCRIPT_NAME default."
print_screen_output "$irc_clear $(($i+1)))${spacer}Continue, no changes or config file setting."
print_screen_output "$irc_clear $(($i+2)))${spacer}Exit, use another terminal, or set manually."
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_screen_output "$LINE1"
print_lines_basic "0" "" "Simply type the number for the color scheme that looks best to your eyes for your $COLOR_SELECTION settings and hit ENTER. NOTE: You can bring this option list up by starting $SCRIPT_NAME with option: -c plus one of these numbers:"
print_lines_basic "0" "" "94^(console,^no X^-^$console); 95^(terminal,^X^-^$virt_term); 96^(irc,^gui,^X^-^$irc_gui); 97^(irc,^X,^in^terminal^-^$irc_x_term); 98^(irc,^no^X^-^$irc_console); 99^(global^-^$global)"
print_lines_basic "0" "" ""
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
print_screen_output "Your selection(s) will be stored here: $config_file"
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "Global overrides all individual color schemes. Individual schemes remove the global setting."
print_screen_output "$LINE1"
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
read user_selection
if [[ -n $( grep -Es '^([0-9]+)$' <<< "$user_selection" ) && $user_selection -lt $i ]];then
case $COLOR_SELECTION in
irc)
config_variable='IRC_COLOR_SCHEME'
;;
irc-console)
config_variable='IRC_CONS_COLOR_SCHEME'
;;
irc-virtual-terminal)
config_variable='IRC_X_TERM_COLOR_SCHEME'
;;
console)
config_variable='CONSOLE_COLOR_SCHEME'
;;
virtual-terminal)
config_variable='VIRT_TERM_COLOR_SCHEME'
;;
global)
config_variable='GLOBAL_COLOR_SCHEME'
;;
esac
set_color_scheme $user_selection
fixed logic error in config file check/creation
2011-04-26 19:50:18 +00:00
# make file/directory first if missing
if [[ ! -f $config_file ]];then
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
if [[ ! -d $HOME/.$SCRIPT_NAME ]];then
mkdir $HOME/.$SCRIPT_NAME
fi
touch $config_file
fixed logic error in config file check/creation
2011-04-26 19:50:18 +00:00
fi
if [[ -z $( grep -s "$config_variable=" $config_file ) ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "Creating and updating config file for $COLOR_SELECTION color scheme now..."
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
echo "$config_variable=$user_selection" >> $config_file
else
print_screen_output "Updating config file for $COLOR_SELECTION color scheme now..."
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
sed $SED_I "s/$config_variable=.*/$config_variable=$user_selection/" $config_file
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
fi
# file exists now so we can go on to cleanup
case $COLOR_SELECTION in
irc|irc-console|irc-virtual-terminal|console|virtual-terminal)
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
sed $SED_I '/GLOBAL_COLOR_SCHEME=/d' $config_file
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
;;
global)
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
sed $SED_I -e '/VIRT_TERM_COLOR_SCHEME=/d' -e '/CONSOLE_COLOR_SCHEME=/d' -e '/IRC_COLOR_SCHEME=/d' \
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
-e '/IRC_CONS_COLOR_SCHEME=/d' -e '/IRC_X_TERM_COLOR_SCHEME=/d' $config_file
;;
esac
elif [[ $user_selection == $i ]];then
print_screen_output "Removing all color settings from config file now..."
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
sed $SED_I -e '/VIRT_TERM_COLOR_SCHEME=/d' -e '/GLOBAL_COLOR_SCHEME=/d' -e '/CONSOLE_COLOR_SCHEME=/d' \
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
-e '/IRC_COLOR_SCHEME=/d' -e '/IRC_CONS_COLOR_SCHEME=/d' -e '/IRC_X_TERM_COLOR_SCHEME=/d' $config_file
set_color_scheme $DEFAULT_COLOR_SCHEME
elif [[ $user_selection == $(( $i+1 )) ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "Ok, continuing $SCRIPT_NAME unchanged. You can set the colors anytime by starting with: -c 95 to 99"
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
if [[ -n $CONSOLE_COLOR_SCHEME && -z $DISPLAY ]];then
set_color_scheme $CONSOLE_COLOR_SCHEME
elif [[ -n $VIRT_TERM_COLOR_SCHEME ]];then
set_color_scheme $VIRT_TERM_COLOR_SCHEME
else
set_color_scheme $DEFAULT_COLOR_SCHEME
fi
elif [[ $user_selection == $(( $i+2 )) ]];then
set_color_scheme $DEFAULT_COLOR_SCHEME
print_screen_output "Ok, exiting $SCRIPT_NAME now. You can set the colors later."
exit 0
else
print_screen_output "Error - Invalid Selection. You entered this: $user_selection"
print_screen_output " "
select_default_color_scheme
fi
else
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_screen_output "$LINE1"
print_lines_basic "0" "" "After finding the scheme number you like, simply run this again in a terminal to set the configuration data file for your irc client. You can set color schemes for the following: start inxi with -c plus:"
fixed color schemes to only show safe dark/light group for irc or global color picker. This solves the problem of unreadable output for some irc viewers Also added output to color picker to show what selection was. Note: I changed some of the colors so the old selections won't be the same, so please update version package maintainers
2011-04-30 18:35:54 +00:00
print_screen_output "94 (console, no X - $console); 95 (terminal, X - $virt_term); 96 (irc, gui, X - $irc_gui);"
print_screen_output "97 (irc, X, in terminal - $irc_x_term); 98 (irc, no X - $irc_console); 99 (global - $global)"
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
exit 0
fi
eval $LOGFE
}
Initial setup of repo
2008-10-28 00:40:43 +00:00
########################################################################
#### UTILITY FUNCTIONS
########################################################################
refactored more, rearranged utility functions
2008-10-28 06:45:56 +00:00
#### -------------------------------------------------------------------
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
#### error handler, debugger, script updater
refactored more, rearranged utility functions
2008-10-28 06:45:56 +00:00
#### -------------------------------------------------------------------
Initial setup of repo
2008-10-28 00:40:43 +00:00
# Error handling
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
# args: $1 - error number; $2 - optional, extra information; $3 - optional extra info
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
error_handler()
Initial setup of repo
2008-10-28 00:40:43 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
Improved -U error handler, added advice to output if wget fails.
2008-10-30 21:28:50 +00:00
local error_message=''
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
# assemble the error message
Initial setup of repo
2008-10-28 00:40:43 +00:00
case $1 in
Made all awk code endings the same, }' )... in all cases, or }' /file/path, or whatever
2008-11-06 21:39:18 +00:00
2) error_message="large flood danger, debug buffer full!"
Initial setup of repo
2008-10-28 00:40:43 +00:00
;;
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
3) error_message="unsupported color scheme number: $2"
Initial setup of repo
2008-10-28 00:40:43 +00:00
;;
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
4) error_message="unsupported verbosity level: $2"
Initial setup of repo
2008-10-28 00:40:43 +00:00
;;
fixed missing app error message, now shows: inxi --recommends as solution/recommendation for further action.
2011-06-11 07:02:13 +00:00
5) error_message="dependency not met: $2 not found in path.\nFor distribution installation package names and missing apps information, run: $SCRIPT_NAME --recommends"
Initial setup of repo
2008-10-28 00:40:43 +00:00
;;
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
6) error_message="/proc not found! Quitting..."
Initial setup of repo
2008-10-28 00:40:43 +00:00
;;
fixed error 7 message
2010-02-13 01:39:53 +00:00
7) error_message="One of the options you entered in your script parameters: $2\nis not supported.The option may require extra arguments to work.\nFor supported options (and their arguments), check the help menu: $SCRIPT_NAME -h"
more refactoring, some bug fixes that made layout display wrong in editors
2008-10-28 02:48:05 +00:00
;;
Updated update error to be more accurate
2008-11-07 20:48:13 +00:00
8) error_message="the self-updater failed, wget exited with error: $2.\nYou probably need to be root.\nHint, to make for easy updates without being root, do: chown <user name> $SCRIPT_PATH/$SCRIPT_NAME"
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
;;
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
9) error_message="unsupported debugging level: $2"
;;
(Change Version) Added -! unsupported argument error condition.
2008-11-11 19:12:24 +00:00
10)
error_message="the alt download url you provided: $2\nappears to be wrong, download aborted. Please note, the url\nneeds to end in /, without $SCRIPT_NAME, like: http://yoursite.com/downloads/"
;;
11)
error_message="unsupported testing option argument: -! $2"
(Change Version) This is now launching inxi as an official script. Changed the default download url to get it directly from google svn. This means that users can always reference the official svn copy to ensure that the code is what it claims to be. Added for development purposes new advanced testing options: -! 1 triggers the boolean testing flag -! 2 triggers an alternative development download -! http://<any website>/path_to_download_directory/ (note: must end in /, and not include inxi file name Updated the script_self_updater function to handle variable download urls, and added an update message that lets the person know where the update source was. Added error handler for user provided testing download urls, if not existing, exit. And with this, I'm handing over control to the inxi project itself.
2008-11-11 18:37:09 +00:00
;;
(change version) Fine tuned the branch download option error messages to better reflect the actual error.
2008-11-13 02:12:08 +00:00
12)
(no version change) fixed typo
2008-11-13 02:28:42 +00:00
error_message="the svn branch download url: $2\nappears to be empty currently. Make sure there is an actual svn branch version\nactive before you try this again. Check http://code.google.com/p/inxi\nto verify the branch status."
(change version) Fine tuned the branch download option error messages to better reflect the actual error.
2008-11-13 02:12:08 +00:00
;;
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
13)
tweaked error message for -t
2010-02-13 05:48:47 +00:00
error_message="The -t option requires the following extra arguments (no spaces between letters/numbers):\nc m cm [required], for example: -t cm8 OR -t cm OR -t c9\n(numbers: 1-20, > 5 throttled to 5 in irc clients) You entered: $2"
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
;;
fixed long broken update, now using test for end of file marker in data before writing to actual file
2011-04-26 19:16:44 +00:00
14)
fixed error message glitch
2011-04-26 20:54:51 +00:00
error_message="failed to write correctly downloaded $SCRIPT_NAME to location $SCRIPT_PATH.\nThis usually means you don't have permission to write to that location, maybe you need to be root?\nThe operation failed with error: $2"
fixed long broken update, now using test for end of file marker in data before writing to actual file
2011-04-26 19:16:44 +00:00
;;
15)
fixed error message glitch
2011-04-26 20:54:51 +00:00
error_message="failed set execute permissions on $SCRIPT_NAME at location $SCRIPT_PATH.\nThis usually means you don't have permission to set permissions on files there, maybe you need to be root?\nThe operation failed with error: $2"
fixed long broken update, now using test for end of file marker in data before writing to actual file
2011-04-26 19:16:44 +00:00
;;
added failed download due to file corruption error and tweaked regex
2011-04-26 19:24:19 +00:00
16)
error_message="$SCRIPT_NAME downloaded but the file data is corrupted. Purged data and using current version."
;;
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
17)
error_message="All $SCRIPT_NAME self updater features have been disabled by the distribution\npackage maintainer. This includes the option you used: $2"
;;
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
18)
error_message="The argument you provided for $2 does not have supported syntax.\nPlease use the following formatting:\n$3"
;;
19)
error_message="The option $2 has been deprecated. Please use $3 instead.\nSee -h for instructions and syntax."
;;
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
20)
error_message="The option you selected has been deprecated. $2\nSee the -h (help) menu for currently supported options."
;;
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
*) error_message="error unknown: $@"
set -- 99
Initial setup of repo
2008-10-28 00:40:43 +00:00
;;
esac
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
# then print it and exit
(no version change) Fixed redundant error inxi word, added error number to output, this should have been done long ago.
2008-11-13 02:20:20 +00:00
print_screen_output "Error $1: $error_message"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Initial setup of repo
2008-10-28 00:40:43 +00:00
exit $1
}
(change version) Fixed debugger for real this time, now it actually works as intended. The infobash debugger never worked at all, unless you explicitly turned it on with debugging flag. Now it does. Pre script up errors will be stored in the error array, and printed out if found automatically no matter what the debugging flag is set to. This is a perfect example of why using highly compressed code with no explicit variable declarations is ALWAYS a bad idea.
2008-12-14 17:20:02 +00:00
# prior to script up set, pack the data into an array
# then we'll print it out later.
# args: $1 - $@ debugging string text
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
script_debugger()
Initial setup of repo
2008-10-28 00:40:43 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
(change version) Fixed debugger for real this time, now it actually works as intended. The infobash debugger never worked at all, unless you explicitly turned it on with debugging flag. Now it does. Pre script up errors will be stored in the error array, and printed out if found automatically no matter what the debugging flag is set to. This is a perfect example of why using highly compressed code with no explicit variable declarations is ALWAYS a bad idea.
2008-12-14 17:20:02 +00:00
if [[ $B_SCRIPT_UP == 'true' ]];then
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
# only return if debugger is off and no pre start up errors have occured
if [[ $DEBUG -eq 0 && $DEBUG_BUFFER_INDEX -eq 0 ]];then
return 0
# print out the stored debugging information if errors occured
elif [[ $DEBUG_BUFFER_INDEX -gt 0 ]];then
for (( DEBUG_BUFFER_INDEX=0; DEBUG_BUFFER_INDEX < ${#A_DEBUG_BUFFER[@]}; DEBUG_BUFFER_INDEX++ ))
do
print_screen_output "${A_DEBUG_BUFFER[$DEBUG_BUFFER_INDEX]}"
done
DEBUG_BUFFER_INDEX=0
fi
# or print out normal debugger messages if debugger is on
if [[ $DEBUG -gt 0 ]];then
print_screen_output "$1"
fi
Initial setup of repo
2008-10-28 00:40:43 +00:00
else
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
if [[ $B_DEBUG_FLOOD == 'true' && $DEBUG_BUFFER_INDEX -gt 10 ]];then
error_handler 2
# this case stores the data for later printout, will print out only
# at B_SCRIPT_UP == 'true' if array index > 0
else
A_DEBUG_BUFFER[$DEBUG_BUFFER_INDEX]="$1"
# increment count for next pre script up debugging error
(( DEBUG_BUFFER_INDEX++ ))
fi
Initial setup of repo
2008-10-28 00:40:43 +00:00
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
}
# NOTE: no logging available until get_parameters is run, since that's what sets logging
# in order to trigger earlier logging manually set B_USE_LOGGING to true in top variables.
# $1 alone: logs data; $2 with or without $3 logs func start/end.
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
# $1 type (fs/fe/cat/raw) or logged data; [$2 is $FUNCNAME; [$3 - function args]]
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data()
{
if [ "$B_USE_LOGGING" == 'true' ];then
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
local logged_data='' spacer=' ' line='----------------------------------------'
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
case $1 in
fs)
logged_data="Function: $2 - Primary: Start"
if [ -n "$3" ];then
logged_data="$logged_data\n${spacer}Args: $3"
fi
spacer=''
;;
fe)
logged_data="Function: $2 - Primary: End"
spacer=''
;;
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
cat)
if [[ $B_LOG_FULL_DATA == 'true' ]];then
logged_data="\n$line\nFull file data: cat $2\n\n$( cat $2 )\n$line\n"
spacer=''
fi
;;
raw)
if [[ $B_LOG_FULL_DATA == 'true' ]];then
logged_data="\n$line\nRaw system data:\n\n$2\n$line\n"
spacer=''
fi
;;
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
*)
logged_data="$1"
;;
esac
# Create any required line breaks and strip out escape color code, either ansi (case 1)or irc (case 2).
# This pattern doesn't work for irc colors, if we need that someone can figure it out
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
if [[ -n $logged_data ]];then
if [[ $B_LOG_COLORS != 'true' ]];then
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
echo -e "${spacer}$logged_data" | sed $SED_RX 's/\x1b\[[0-9]{1,2}(;[0-9]{1,2}){0,2}m//g' >> $LOG_FILE
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
else
echo -e "${spacer}$logged_data" >> $LOG_FILE
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
fi
fi
}
# called in the initial -@ 10 script args setting so we can get logging as soon as possible
# will have max 3 files, inxi.log, inxi.1.log, inxi.2.log
create_rotate_logfiles()
{
if [[ ! -d $SCRIPT_DATA_DIR ]];then
mkdir $SCRIPT_DATA_DIR
fi
# do the rotation if logfile exists
if [[ -f $LOG_FILE ]];then
# copy if present second to third
if [[ -f $LOG_FILE_1 ]];then
mv -f $LOG_FILE_1 $LOG_FILE_2
fi
# then copy initial to second
mv -f $LOG_FILE $LOG_FILE_1
fi
# now create the logfile
touch $LOG_FILE
# and echo the start data
echo "=========================================================" >> $LOG_FILE
echo "START $SCRIPT_NAME LOGGING:" >> $LOG_FILE
echo "Script started: $( date +%Y-%m-%d-%H:%M:%S )" >> $LOG_FILE
echo "=========================================================" >> $LOG_FILE
Initial setup of repo
2008-10-28 00:40:43 +00:00
}
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# args: $1 - download url, not including file name; $2 - string to print out
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
# $3 - update type option
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# note that $1 must end in / to properly construct the url path
script_self_updater()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
inxi -U will now install the man file too, but only if /usr/share/man/man8 directory exists. And if user is logged in as root. The -U procedure for inxi itself will run independently of that. On completion of inxi download/update, if successful, will do the man page update/install. And that's that.
2012-06-25 23:35:24 +00:00
local wget_error=0 file_contents='' wget_man_error=0
bug fix
2012-09-11 18:42:56 +00:00
local man_file_path="$MAN_FILE_LOCATION/inxi.1.gz"
New version, new tarball. Disabled -U in irc clients, with an exit error message.
2013-01-23 22:46:54 +00:00
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'true' ]];then
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
print_screen_output "Sorry, you can't run the $SCRIPT_NAME self updater option (-$3) in an IRC client."
New version, new tarball. Disabled -U in irc clients, with an exit error message.
2013-01-23 22:46:54 +00:00
exit 1
fi
tweaked it a bit, updated man page to note that -U installs/updates man, new tarball.
2012-06-25 23:49:21 +00:00
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
print_screen_output "Starting $SCRIPT_NAME self updater."
print_screen_output "Currently running $SCRIPT_NAME version number: $SCRIPT_VERSION_NUMBER"
language change
2011-06-09 20:41:56 +00:00
print_screen_output "Current version patch number: $SCRIPT_PATCH_NUMBER"
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
print_screen_output "Updating $SCRIPT_NAME in $SCRIPT_PATH using $2 as download source..."
fixed long broken update, now using test for end of file marker in data before writing to actual file
2011-04-26 19:16:44 +00:00
file_contents="$( wget -q -O - $1$SCRIPT_NAME )" || wget_error=$?
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# then do the actual download
fixed long broken update, now using test for end of file marker in data before writing to actual file
2011-04-26 19:16:44 +00:00
if [[ $wget_error -eq 0 ]];then
# make sure the whole file got downloaded and is in the variable
added failed download due to file corruption error and tweaked regex
2011-04-26 19:24:19 +00:00
if [[ -n $( grep '###\*\*EOF\*\*###' <<< "$file_contents" ) ]];then
fixed long broken update, now using test for end of file marker in data before writing to actual file
2011-04-26 19:16:44 +00:00
echo "$file_contents" > $SCRIPT_PATH/$SCRIPT_NAME || error_handler 14 "$?"
chmod +x $SCRIPT_PATH/$SCRIPT_NAME || error_handler 15 "$?"
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
SCRIPT_VERSION_NUMBER=$( parse_version_data 'main' )
SCRIPT_PATCH_NUMBER=$( parse_version_data 'patch' )
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
print_screen_output "Successfully updated to $2 version: $SCRIPT_VERSION_NUMBER"
language change
2011-06-09 20:41:56 +00:00
print_screen_output "New $2 version patch number: $SCRIPT_PATCH_NUMBER"
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
print_screen_output "To run the new version, just start $SCRIPT_NAME again."
inxi -U will now install the man file too, but only if /usr/share/man/man8 directory exists. And if user is logged in as root. The -U procedure for inxi itself will run independently of that. On completion of inxi download/update, if successful, will do the man page update/install. And that's that.
2012-06-25 23:35:24 +00:00
print_screen_output "----------------------------------------"
print_screen_output "Starting download of man page file now."
tweaked it a bit, updated man page to note that -U installs/updates man, new tarball.
2012-06-25 23:49:21 +00:00
if [[ ! -d $MAN_FILE_LOCATION ]];then
print_screen_output "The required man directory was not detected on your system, unable to continue: $MAN_FILE_LOCATION"
inxi -U will now install the man file too, but only if /usr/share/man/man8 directory exists. And if user is logged in as root. The -U procedure for inxi itself will run independently of that. On completion of inxi download/update, if successful, will do the man page update/install. And that's that.
2012-06-25 23:35:24 +00:00
else
if [[ $B_ROOT == 'true' ]];then
print_screen_output "Checking Man page download URL..."
updated inxi updater to get inxi.1.gz instead of inxi.8.gz, and also to mv man8/inxi.8.gz to man1/inxi.1.gz if detected. that should bring inxi back into sync with the methods of man.
2012-09-11 17:55:47 +00:00
if [[ -f /usr/share/man/man8/inxi.8.gz ]];then
print_screen_output "Updating man page location to man1."
mv -f /usr/share/man/man8/inxi.8.gz /usr/share/man/man1/inxi.1.gz
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p mandb &>/dev/null;then
forgot to update mandb on mv
2012-09-11 17:59:32 +00:00
exec $( type -p mandb ) -q
fi
updated inxi updater to get inxi.1.gz instead of inxi.8.gz, and also to mv man8/inxi.8.gz to man1/inxi.1.gz if detected. that should bring inxi back into sync with the methods of man.
2012-09-11 17:55:47 +00:00
fi
inxi -U will now install the man file too, but only if /usr/share/man/man8 directory exists. And if user is logged in as root. The -U procedure for inxi itself will run independently of that. On completion of inxi download/update, if successful, will do the man page update/install. And that's that.
2012-06-25 23:35:24 +00:00
wget -q --spider $MAN_FILE_DOWNLOAD || wget_man_error=$?
if [[ $wget_man_error -eq 0 ]];then
print_screen_output "Man file download URL verified: $MAN_FILE_DOWNLOAD"
print_screen_output "Downloading Man page file now."
debugged, final tarball for this round.
2012-06-25 23:58:29 +00:00
wget -q -O $man_file_path $MAN_FILE_DOWNLOAD || wget_man_error=$?
inxi -U will now install the man file too, but only if /usr/share/man/man8 directory exists. And if user is logged in as root. The -U procedure for inxi itself will run independently of that. On completion of inxi download/update, if successful, will do the man page update/install. And that's that.
2012-06-25 23:35:24 +00:00
if [[ $wget_man_error -gt 0 ]];then
print_screen_output "Oh no! Something went wrong downloading the Man gz file at: $MAN_FILE_DOWNLOAD"
tweaked it a bit, updated man page to note that -U installs/updates man, new tarball.
2012-06-25 23:49:21 +00:00
print_screen_output "Check the error messages for what happened. Error: $wget_man_error"
inxi -U will now install the man file too, but only if /usr/share/man/man8 directory exists. And if user is logged in as root. The -U procedure for inxi itself will run independently of that. On completion of inxi download/update, if successful, will do the man page update/install. And that's that.
2012-06-25 23:35:24 +00:00
else
typo fix
2012-06-25 23:59:26 +00:00
print_screen_output "Download/install of man page successful. Check to make sure it works: man inxi"
inxi -U will now install the man file too, but only if /usr/share/man/man8 directory exists. And if user is logged in as root. The -U procedure for inxi itself will run independently of that. On completion of inxi download/update, if successful, will do the man page update/install. And that's that.
2012-06-25 23:35:24 +00:00
fi
else
print_screen_output "Man file download URL failed, unable to continue: $MAN_FILE_DOWNLOAD"
fi
else
tweaked it a bit, updated man page to note that -U installs/updates man, new tarball.
2012-06-25 23:49:21 +00:00
print_screen_output "Updating / Installing the Man page requires root user, writing to: $MAN_FILE_LOCATION"
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
print_screen_output "If you want the man page, you'll have to run $SCRIPT_NAME -$3 as root."
inxi -U will now install the man file too, but only if /usr/share/man/man8 directory exists. And if user is logged in as root. The -U procedure for inxi itself will run independently of that. On completion of inxi download/update, if successful, will do the man page update/install. And that's that.
2012-06-25 23:35:24 +00:00
fi
fi
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
exit 0
fixed long broken update, now using test for end of file marker in data before writing to actual file
2011-04-26 19:16:44 +00:00
else
added failed download due to file corruption error and tweaked regex
2011-04-26 19:24:19 +00:00
error_handler 16
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
fi
# now run the error handlers on any wget failure
cleaned up some cruft
2011-05-20 08:32:01 +00:00
else
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
if [[ $2 == 'svn server' ]];then
error_handler 8 "$wget_error"
elif [[ $2 == 'alt server' ]];then
error_handler 10 "$1"
else
error_handler 12 "$1"
fi
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
}
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
# args: $1 - debug data type: sys|xorg|disk
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
debug_data_collector()
{
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
local xiin_app='' xiin_data_file='' xiin_download='' error='' b_run_xiin='false'
more debugger fine tuning
2014-03-20 20:13:10 +00:00
local debug_data_dir='' bsd_string='' xorg_d_files='' xorg_file=''
added debugging option -! ftp.<alternate ftp upload location> just so it's not restricted to ftp.techpatterns.com
2011-06-27 18:40:42 +00:00
local completed_gz_file='' xiin_file='xiin.py' ftp_upload='ftp.techpatterns.com/incoming'
local Line='-------------------------'
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
local start_directory=$( pwd )
debugger output file name change to make it a bit cleaner
2014-03-20 19:48:03 +00:00
local host=$HOSTNAME
if [[ -n $host ]];then
host=${host// /-}
host="-${host,,}"
else
host="-no-host"
fi
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
if [[ -n $BSD_TYPE ]];then
debugger output file name change to make it a bit cleaner
2014-03-20 19:48:03 +00:00
bsd_string="-$BSD_TYPE"
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
fi
debugger output file name change to make it a bit cleaner
2014-03-20 19:48:03 +00:00
debug_data_dir="inxi$bsd_string$host-$(date +%Y%m%d-%H%M%S)-$1"
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'false' ]];then
added debugging option -! ftp.<alternate ftp upload location> just so it's not restricted to ftp.techpatterns.com
2011-06-27 18:40:42 +00:00
if [[ -n $ALTERNATE_FTP ]];then
ftp_upload=$ALTERNATE_FTP
fi
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
echo "Starting debugging data collection type: $1"
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
echo -n "Checking/creating required directories... "
if [[ ! -d $SCRIPT_DATA_DIR ]];then
mkdir $SCRIPT_DATA_DIR
fi
echo 'completed'
cd $SCRIPT_DATA_DIR
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
if [[ -d $SCRIPT_DATA_DIR/$debug_data_dir ]];then
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
echo 'Deleting previous xiin data directory...'
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
rm -rf $SCRIPT_DATA_DIR/$debug_data_dir
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
fi
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
mkdir $SCRIPT_DATA_DIR/$debug_data_dir
if [[ -f $SCRIPT_DATA_DIR/$debug_data_dir.tar.gz ]];then
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
echo 'Deleting previous tar.gz file...'
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
rm -f $SCRIPT_DATA_DIR/$debug_data_dir.tar.gz
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
fi
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
echo 'Collecting system info: sensors, lsusb, lspci, lspci -v data, plus /proc data'
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
echo 'also checking for dmidecode data: note, you must be root to have dmidecode work.'
echo "Data going into: $SCRIPT_DATA_DIR/$debug_data_dir"
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
# bsd tools
pciconf -vl &> $debug_data_dir/bsd-pciconf-vl.txt
sysctl -a &> $debug_data_dir/bsd-sysctl-a.txt
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
dmidecode &> $debug_data_dir/dmidecode.txt
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
lscpu &> $debug_data_dir/lscpu.txt
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
lspci &> $debug_data_dir/lspci.txt
added more debugging data collection for lspci output types, might be able to get better support for failed machine type and other data types.
2014-03-21 22:33:51 +00:00
lspci -k &> $debug_data_dir/lspci-k.txt
lspci -knn &> $debug_data_dir/lspci-knn.txt
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
lspci -n &> $debug_data_dir/lspci-n.txt
added lspci -nn to debug collector
2014-03-20 19:54:20 +00:00
lspci -nn &> $debug_data_dir/lspci-nn.txt
added more debugging data collection for lspci output types, might be able to get better support for failed machine type and other data types.
2014-03-21 22:33:51 +00:00
lspci -mm &> $debug_data_dir/lspci-mm.txt
lspci -mmnn &> $debug_data_dir/lspci-mmnn.txt
lspci -mmnnv &> $debug_data_dir/lspci-mmnnv.txt
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
lspci -v &> $debug_data_dir/lspci-v.txt
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
lsusb &> $debug_data_dir/lsusb.txt
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
ps aux &> $debug_data_dir/ps-aux.txt
added some debugger output
2014-01-14 23:07:22 +00:00
runlevel &> $debug_data_dir/runlevel.txt
systemctl list-units &> $debug_data_dir/systemctl-list-units.txt
systemctl list-units --type=target &> $debug_data_dir/systemctl-list-units-target.txt
initctl list &> $debug_data_dir/initctl-list.txt
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
sensors &> $debug_data_dir/sensors.txt
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
strings --version &> $debug_data_dir/strings.txt
Adding nvidia-smi debug data collectors for possible gpu / nvidia extra features. No other changes, no change in version yet. This is only for inxi -U updates, developers ignore this for now.
2013-11-05 20:29:13 +00:00
nvidia-smi -q &> $debug_data_dir/nvidia-smi-q.txt
nvidia-smi -q -x &> $debug_data_dir/nvidia-smi-xq.txt
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
finalizing new gcc version feature
2011-07-06 20:09:29 +00:00
ls /usr/bin/gcc* &> $debug_data_dir/gcc-sys-versions.txt
added some to debugger, protect against bad gcc as well
2011-07-06 01:51:20 +00:00
gcc --version &> $debug_data_dir/gcc-version.txt
one more distro id added to debugger collector, no need for new version
2012-10-04 02:34:10 +00:00
cat /etc/issue &> $debug_data_dir/etc-issue.txt
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
cat $FILE_LSB_RELEASE &> $debug_data_dir/lsb-release.txt
added to data collector /etc/os-release
2012-07-22 00:25:04 +00:00
cat $FILE_OS_RELEASE &> $debug_data_dir/os-release.txt
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
cat $FILE_ASOUND_DEVICE &> $debug_data_dir/proc-asound-device.txt
cat $FILE_ASOUND_VERSION &> $debug_data_dir/proc-asound-version.txt
cat $FILE_CPUINFO &> $debug_data_dir/proc-cpu-info.txt
cat $FILE_MEMINFO &> $debug_data_dir/proc-meminfo.txt
cat $FILE_MODULES &> $debug_data_dir/proc-modules.txt
bug fix, new patch version, forgot to remove a debugger thing yesterday.
2011-06-22 18:09:01 +00:00
cat /proc/net/arp &> $debug_data_dir/proc-net-arp.txt
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
# bsd data
cat /var/run/dmesg.boot &> $debug_data_dir/bsd-var-run-dmesg.boot.txt
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
check_recommends_user_output &> $debug_data_dir/check-recommends-user-output.txt
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
# first download and verify xiin
if [[ $B_UPLOAD_DEBUG_DATA == 'true' || $1 == 'disk' || $1 == 'sys' || $1 == 'all' ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
touch $SCRIPT_DATA_DIR/$debug_data_dir/xiin-error.txt
patch, for debugging tools, added python version, tweaked a few other things.
2011-06-25 18:33:50 +00:00
echo "Downloading required tree traverse tool $xiin_file..."
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
if [[ -f xiin && ! -f $xiin_file ]];then
mv -f xiin $xiin_file
fi
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
# -Nc is creating really weird download anomolies, so using -O instead
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
xiin_download="$( wget -q -O - http://inxi.googlecode.com/svn/branches/xiin/$xiin_file )"
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
# if nothing got downloaded kick out error, otherwise we'll use an older version
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
if [[ $? -gt 0 && ! -f $xiin_file ]];then
echo -e "ERROR: Failed to download required file: $xiin_file\nMaybe the remote site is down or your networking is broken?"
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
echo "Continuing with incomplete data collection."
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
echo "$xiin_file download failed and no existing $xiin_file" >> $debug_data_dir/xiin-error.txt
some more debugger tweaks
2011-06-25 21:54:53 +00:00
elif [[ -n $( grep -s '# EOF' <<< "$xiin_download" ) || -f $xiin_file ]];then
if [[ -n $( grep -s '# EOF' <<< "$xiin_download" ) ]];then
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
echo "Updating $xiin_file from remote location"
echo "$xiin_download" > $xiin_file
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
else
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
echo "Using local $xiin_file due to download failure"
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
fi
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
b_run_xiin='true'
else
echo -e "ERROR: $xiin_file downloaded but the program file data is corrupted.\nContinuing with incomplete data collection."
echo "$xiin_file downloaded but the program file data is corrupted." >> $debug_data_dir/xiin-error.txt
fi
fi
# note, only bash 4> supports ;;& for case, so using if/then here
if [[ $1 == 'disk' || $1 == 'sys' || $1 == 'all' ]];then
xiin_data_file=$SCRIPT_DATA_DIR/$debug_data_dir/xiin-sys.txt
echo 'Collecting networking data...'
ifconfig &> $debug_data_dir/ifconfig.txt
major fix for ip addr output, handled weak cases, now it inserts a newline before each record item with sed to create discrete records for gawk to parse easily. this solves the problem exposed when there is no ipv6 output, and thus the last line used to test for end of record was vanished. now it's all just treated like ifconfig except a few small differences of which item to slice out.
2011-06-25 01:17:16 +00:00
ip addr &> $debug_data_dir/ip-addr.txt
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ $b_run_xiin == 'true' && -z $BSD_TYPE ]];then
added debugging option -! ftp.<alternate ftp upload location> just so it's not restricted to ftp.techpatterns.com
2011-06-27 18:40:42 +00:00
echo $Line
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
echo "Running $xiin_file tool now on /sys..."
oops, hit ctrl-x instead of ctrl-c. Fix. No version bump.
2012-07-02 03:30:41 +00:00
echo "Using Python version:" && python --version
fixed tabs/spaces
2012-07-02 03:57:12 +00:00
python --version &> $debug_data_dir/python-version.txt
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
python ./$xiin_file -d /sys -f $xiin_data_file
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
if [[ $? -ne 0 ]];then
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
error=$?
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
echo -e "ERROR: $xiin_file exited with error $error - removing data file.\nContinuing with incomplete data collection."
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
echo "Continuing with incomplete data collection."
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
rm -f $xiin_data_file
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
echo "$xiin_file data generation failed with python error $error" >> $debug_data_dir/xiin-error.txt
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
fi
added debugging option -! ftp.<alternate ftp upload location> just so it's not restricted to ftp.techpatterns.com
2011-06-27 18:40:42 +00:00
echo $Line
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
fi
fi
if [[ $1 == 'xorg' || $1 == 'all' ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ $B_RUNNING_IN_DISPLAY != 'true' ]];then
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
echo 'Warning: only some of the data collection can occur if you are not in X'
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
touch $debug_data_dir/warning-user-not-in-x
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
fi
if [[ $B_ROOT == 'true' ]];then
echo 'Warning: only some of the data collection can occur if you are running as Root user'
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
touch $debug_data_dir/warning-root-user
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
fi
echo 'Collecting Xorg log and xorg.conf files'
if [[ -e $FILE_XORG_LOG ]];then
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
cat $FILE_XORG_LOG &> $debug_data_dir/xorg-log-file.txt
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
else
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
touch $debug_data_dir/no-xorg-log-file
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
fi
if [[ -e /etc/X11/xorg.conf ]];then
more debugger fine tuning
2014-03-20 20:13:10 +00:00
cat /etc/X11/xorg.conf &> $debug_data_dir/xorg-conf.txt
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
else
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
touch $debug_data_dir/no-xorg-conf-file
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
fi
if [[ -n $( ls /etc/X11/xorg.conf.d/ 2>/dev/null ) ]];then
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
ls /etc/X11/xorg.conf.d &> $debug_data_dir/ls-etc-x11-xorg-conf-d.txt
more debugger fine tuning
2014-03-20 20:13:10 +00:00
xorg_d_files=$(ls /etc/X11/xorg.conf.d)
for xorg_file in $xorg_d_files
do
cat /etc/X11/xorg.conf.d/$xorg_file &> $debug_data_dir/xorg-conf-d-$xorg_file.txt
done
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
else
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
touch $debug_data_dir/no-xorg-conf-d-files
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
fi
echo 'Collecting X, xprop, glxinfo, xrandr, xdpyinfo data...'
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
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
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
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
echo $KDE_SESSION_VERSION &> $debug_data_dir/kde456-session-version.txt
echo "$(kded$KDE_SESSION_VERSION --version )" &> $debug_data_dir/kde-version-data.txt
echo $XDG_CURRENT_DESKTOP &> $debug_data_dir/xdg-current-desktop.txt
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
fi
if [[ $1 == 'disk' || $1 == 'all' ]];then
echo 'Collecting dev, label, disk, uuid data, df...'
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
ls -l /dev &> $debug_data_dir/dev-data.txt
ls -l /dev/disk &> $debug_data_dir/dev-disk-data.txt
ls -l /dev/disk/by-id &> $debug_data_dir/dev-disk-id-data.txt
ls -l /dev/disk/by-label &> $debug_data_dir/dev-disk-label-data.txt
ls -l /dev/disk/by-uuid &> $debug_data_dir/dev-disk-uuid-data.txt
ls -l /dev/disk/by-path &> $debug_data_dir/dev-disk-path-data.txt
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
ls -l /dev/mapper &> $debug_data_dir/dev-disk-mapper-data.txt
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
readlink /dev/root &> $debug_data_dir/dev-root.txt
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
df -h -T -P --exclude-type=aufs --exclude-type=squashfs --exclude-type=unionfs --exclude-type=devtmpfs --exclude-type=tmpfs --exclude-type=iso9660 --exclude-type=devfs --exclude-type=linprocfs --exclude-type=sysfs --exclude-type=fdescfs &> $debug_data_dir/df-h-T-P-excludes.txt
df -T -P --exclude-type=aufs --exclude-type=squashfs --exclude-type=unionfs --exclude-type=devtmpfs --exclude-type=tmpfs --exclude-type=iso9660 --exclude-type=devfs --exclude-type=linprocfs --exclude-type=sysfs --exclude-type=fdescfs &> $debug_data_dir/df-T-P-excludes.txt
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
df -H -T &> $debug_data_dir/bsd-df-H-T-no-excludes.txt
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
df -H &> $debug_data_dir/bsd-df-H-no-excludes.txt
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
# bsd tool
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
mount &> $debug_data_dir/mount.txt
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
gpart list &> $debug_data_dir/bsd-gpart-list.txt
gpart show &> $debug_data_dir/bsd-gpart-show.txt
gpart status &> $debug_data_dir/bsd-gpart-status.txt
swapctl -l &> $debug_data_dir/bsd-swapctl-l.txt
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
swapon -s &> $debug_data_dir/swapon-s.txt
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
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
zpool list -v &> $debug_data_dir/bsd-zpool-list-v.txt
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
df -P --exclude-type=aufs --exclude-type=squashfs --exclude-type=unionfs --exclude-type=devtmpfs --exclude-type=tmpfs --exclude-type=iso9660 &> $debug_data_dir/df-P-excludes.txt
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
df -P &> $debug_data_dir/bsd-df-P-no-excludes.txt
added /proc/mdstat output to disk data collector function.
2012-04-26 18:16:39 +00:00
cat /proc/mdstat &> $debug_data_dir/proc-mdstat.txt
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
cat $FILE_PARTITIONS &> $debug_data_dir/proc-partitions.txt
cat $FILE_SCSI &> $debug_data_dir/proc-scsi.txt
cat $FILE_MOUNTS &> $debug_data_dir/proc-mounts.txt
cat /proc/sys/dev/cdrom/info &> $debug_data_dir/proc-cdrom-info.txt
ls /proc/ide/ &> $debug_data_dir/proc-ide.txt
cat /proc/ide/*/* &> $debug_data_dir/proc-ide-hdx-cat.txt
cat /etc/fstab &> $debug_data_dir/etc-fstab.txt
cat /etc/mtab &> $debug_data_dir/etc-mtab.txt
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
fi
added inxi output to debugger data files
2011-05-27 21:37:17 +00:00
echo 'Creating inxi output file now. This can take a few seconds...'
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
echo "Starting $SCRIPT_NAME from: $start_directory"
cd $start_directory
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
$SCRIPT_PATH/$SCRIPT_NAME -FRploudxxx -c 0 -@ 8 > $SCRIPT_DATA_DIR/$debug_data_dir/inxi-FRploudxxx.txt
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
cp $LOG_FILE $SCRIPT_DATA_DIR/$debug_data_dir
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
if [[ -f $SCRIPT_DATA_DIR/$debug_data_dir.tar.gz ]];then
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
echo "Found and removing previous tar.gz data file: $debug_data_dir.tar.gz"
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
rm -f $SCRIPT_DATA_DIR/$debug_data_dir.tar.gz
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
fi
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
cd $SCRIPT_DATA_DIR
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
echo 'Creating tar.gz compressed file of this material now. Contents:'
added debugging option -! ftp.<alternate ftp upload location> just so it's not restricted to ftp.techpatterns.com
2011-06-27 18:40:42 +00:00
echo $Line
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
tar -cvzf $debug_data_dir.tar.gz $debug_data_dir
added debugging option -! ftp.<alternate ftp upload location> just so it's not restricted to ftp.techpatterns.com
2011-06-27 18:40:42 +00:00
echo $Line
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
echo 'Cleaning up leftovers...'
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
rm -rf $debug_data_dir
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
echo 'Testing gzip file integrity...'
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
gzip -t $debug_data_dir.tar.gz
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
if [[ $? -gt 0 ]];then
text tweak
2011-05-06 21:22:45 +00:00
echo 'Data in gz is corrupted, removing gzip file, try running data collector again.'
(package maintainers, no worries on this one, it's just debugging tools) Updated the debugging data collector to not exit on error of xiin, and also added some debugger outputs.
2011-06-21 20:53:38 +00:00
rm -f $debug_data_dir.tar.gz
echo "Data in gz is corrupted, removed gzip file" >> $debug_data_dir/gzip-error.txt
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
else
echo 'All done, you can find your data gzipped directory here:'
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
completed_gz_file=$SCRIPT_DATA_DIR/$debug_data_dir.tar.gz
echo $completed_gz_file
if [[ $B_UPLOAD_DEBUG_DATA == 'true' ]];then
added debugging option -! ftp.<alternate ftp upload location> just so it's not restricted to ftp.techpatterns.com
2011-06-27 18:40:42 +00:00
echo $Line
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
if [[ $b_run_xiin == 'true' ]];then
added debugging option -! ftp.<alternate ftp upload location> just so it's not restricted to ftp.techpatterns.com
2011-06-27 18:40:42 +00:00
echo "Running automatic upload of data to remote server $ftp_upload now..."
fixed space/vs tabbing indentation. inxi uses tabs, not spaces.
2011-06-25 17:11:23 +00:00
python ./$xiin_file --version
added debugging option -! ftp.<alternate ftp upload location> just so it's not restricted to ftp.techpatterns.com
2011-06-27 18:40:42 +00:00
python ./$xiin_file -u $completed_gz_file $ftp_upload
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
if [[ $? -gt 0 ]];then
added debugging option -! ftp.<alternate ftp upload location> just so it's not restricted to ftp.techpatterns.com
2011-06-27 18:40:42 +00:00
echo $Line
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
echo "Error: looks like the ftp upload failed. Error number: $?"
echo "The ftp upload failed. Error number: $?" >> $debug_data_dir/xiin-error.txt
fi
else
echo 'Unable to run the automoatic ftp upload because of an error with the xiin download.'
echo "Unable to run the automoatic ftp upload because of an error with the xiin download" >> $debug_data_dir/xiin-error.txt
fi
else
echo 'You can upload this here using most file managers: ftp.techpatterns.com/incoming'
echo 'then let a maintainer know it is uploaded.'
fi
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
fi
else
echo 'This feature only available in console or shell client! Exiting now.'
fi
exit 0
}
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
check_recommends_user_output()
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
{
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
local Line=$LINE1
patch, for debugging tools, added python version, tweaked a few other things.
2011-06-25 18:33:50 +00:00
local gawk_version='N/A' sed_version='N/A' sudo_version='N/A' python_version='N/A'
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'true' ]];then
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
print_screen_output "Sorry, you can't run this option in an IRC client."
exit 1
fi
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
initialize_paths
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "$SCRIPT_NAME will now begin checking for the programs it needs to operate. First a check of the main languages and tools $SCRIPT_NAME uses. Python is only for debugging data collection."
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
echo $Line
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
echo "Bash version: $( bash --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU bash/ {print $4}' )"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p gawk &>/dev/null;then
patch, for debugging tools, added python version, tweaked a few other things.
2011-06-25 18:33:50 +00:00
gawk_version=$( gawk --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU Awk/ {print $3}' )
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p sed &>/dev/null;then
patch, for debugging tools, added python version, tweaked a few other things.
2011-06-25 18:33:50 +00:00
sed_version=$( sed --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU sed version/ {print $4}' )
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ -z $sed_version ]];then
# note: bsd sed shows error with --version flag
sed_version=$( sed --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^sed: illegal option/ {print "BSD sed"}' )
fi
added a debugger output for sed version
2011-06-20 05:25:41 +00:00
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p sudo &>/dev/null;then
patch, for debugging tools, added python version, tweaked a few other things.
2011-06-25 18:33:50 +00:00
sudo_version=$( sudo -V 2>&1 | awk 'BEGIN {IGNORECASE=1} /^Sudo version/ {print $3}' )
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p python &>/dev/null;then
patch, for debugging tools, added python version, tweaked a few other things.
2011-06-25 18:33:50 +00:00
python_version=$( python --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^Python/ {print $2}' )
fi
echo "Gawk version: $gawk_version"
echo "Sed version: $sed_version"
echo "Sudo version: $sudo_version"
echo "Python version: $python_version"
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
echo $Line
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
echo "Test One: Required System Directories."
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "If one of these system directories is missing, $SCRIPT_NAME cannot operate:"
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
echo
bug fix
2011-06-11 05:14:32 +00:00
check_recommends_items 'required-dirs'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
echo "Test Two: Required Core Applications."
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "If one of these applications is missing, $SCRIPT_NAME cannot operate:"
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
echo
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
check_recommends_items 'required-apps'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "Test Three: Script Recommends for Graphics Features."
print_lines_basic "0" "" "NOTE: If you do not use X these do not matter (like a headless server). Otherwise, if one of these applications is missing, $SCRIPT_NAME will have incomplete output:"
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
echo
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
check_recommends_items 'recommended-x-apps'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
echo 'Test Four: Script Recommends for Remaining Features.'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "If one of these applications is missing, $SCRIPT_NAME will have incomplete output:"
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
echo
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
check_recommends_items 'recommended-apps'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
echo 'Test Five: System Directories for Various Information.'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "If one of these directories is missing, $SCRIPT_NAME will have incomplete output:"
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
echo
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
check_recommends_items 'system-dirs'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
echo 'All tests completed.'
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
}
# args: $1 - check item
check_recommends_items()
{
local item='' item_list='' item_string='' missing_items='' missing_string=''
forgot to declare a bunch of local variables in --recommends
2011-06-11 00:07:38 +00:00
local package='' application='' feature='' type='' starter='' finisher=''
local package_deb='' package_pacman='' package_rpm=''
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
local print_string='' separator='' width=56
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
local required_dirs='/proc /sys'
finalized the rpm/yum --recommends package list, thanks goingeasy9
2011-06-11 04:24:18 +00:00
# package-owner: 1 - debian/ubuntu; 2 - arch; 3 - yum/rpm
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
# pardus: pisi sf -q /usr/bin/package
local required_apps='
finalized the rpm/yum --recommends package list, thanks goingeasy9
2011-06-11 04:24:18 +00:00
df:coreutils~coreutils~coreutils~:partition_data
patch update, cleaned up output for --recommends, changed - to _, then sed replace _ with space
2011-06-11 01:34:19 +00:00
gawk:gawk~gawk~gawk~:core_tool
grep:grep~grep~grep~:string_search
finalized the rpm/yum --recommends package list, thanks goingeasy9
2011-06-11 04:24:18 +00:00
lspci:pciutils~pciutils~pciutils~:hardware_data
ps:procps~procps~procps~:process_data
readlink:coreutils~coreutils~coreutils~:
patch update, cleaned up output for --recommends, changed - to _, then sed replace _ with space
2011-06-11 01:34:19 +00:00
sed:sed~sed~sed~:string_replace
finalized the rpm/yum --recommends package list, thanks goingeasy9
2011-06-11 04:24:18 +00:00
tr:coreutils~coreutils~coreutils~:character_replace
uname:uname~coreutils~coreutils~:kernel_data
uptime:procps~procps~procps~:
wc:coreutils~coreutils~coreutils~:word_character_count
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
'
local x_recommends='
fixed bad display in opensuse glx recommends, only fix for opensuse users unless you already packaged the last version, then you should update because the output will be broken.
2013-05-30 21:38:59 +00:00
glxinfo:mesa-utils~mesa-demos~glx-utils_(openSUSE_12.3_and_later_Mesa-demo-x)~:-G_glx_info
finalized the rpm/yum --recommends package list, thanks goingeasy9
2011-06-11 04:24:18 +00:00
xdpyinfo:X11-utils~xorg-xdpyinfo~xorg-x11-utils~:-G_multi_screen_resolution
updated recommends for arch, xprop has changed to xorg-xprop
2012-03-26 20:32:27 +00:00
xprop:X11-utils~xorg-xprop~x11-utils~:-S_desktop_data
finalized the rpm/yum --recommends package list, thanks goingeasy9
2011-06-11 04:24:18 +00:00
xrandr:x11-xserver-utils~xrandr~x11-server-utils~:-G_single_screen_resolution
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
'
local recommended_apps='
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
dmidecode:dmidecode~dmidecode~dmidecode~:-M_if_no_sys_machine_data
patch update, cleaned up output for --recommends, changed - to _, then sed replace _ with space
2011-06-11 01:34:19 +00:00
file:file~file~file~:-o_unmounted_file_system
hddtemp:hddtemp~hddtemp~hddtemp~:-Dx_show_hdd_temp
tweak
2011-07-11 21:26:49 +00:00
ifconfig:net-tools~net-tools~net-tools~:-i_ip_lan-deprecated
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
ip:iproute~iproute2~iproute~:-i_ip_lan
finalized the rpm/yum --recommends package list, thanks goingeasy9
2011-06-11 04:24:18 +00:00
sensors:lm-sensors~lm_sensors~lm-sensors~:-s_sensors_output
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
strings:binutils~~~:-I_sysvinit_version
finalized the rpm/yum --recommends package list, thanks goingeasy9
2011-06-11 04:24:18 +00:00
lsusb:usbutils~usbutils~usbutils~:-A_usb_audio;-N_usb_networking
modinfo:module-init-tools~module-init-tools~module-init-tools~:-Ax,-Nx_module_version
runlevel:sysvinit~sysvinit~systemd~:-I_runlevel
patch update, cleaned up output for --recommends, changed - to _, then sed replace _ with space
2011-06-11 01:34:19 +00:00
sudo:sudo~sudo~sudo~:-Dx_hddtemp-user;-o_file-user
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
'
local recommended_dirs='
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
/sys/class/dmi/id:-M_system,_motherboard,_bios
patch update, cleaned up output for --recommends, changed - to _, then sed replace _ with space
2011-06-11 01:34:19 +00:00
/dev:-l,-u,-o,-p,-P,-D_disk_partition_data
cleanup
2011-06-11 01:45:37 +00:00
/dev/disk/by-label:-l,-o,-p,-P_partition_labels
/dev/disk/by-uuid:-u,-o,-p,-P_partition_uuid
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
/var/run/dmesg.boot:-C,-f_(BSD_only)
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
if [[ -n $COLS_INNER ]];then
if [[ $COLS_INNER -ge 90 ]];then
width=${#LINE1} # match width of $LINE1
elif [[ $COLS_INNER -ge 78 ]];then
width=$(( $COLS_INNER - 11 ))
fi
fi
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
case $1 in
required-dirs)
item_list=$required_dirs
item_string='Required file system'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
item_string=''
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
missing_string='system directories'
type='directories'
;;
required-apps)
item_list=$required_apps
item_string='Required application'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
item_string=''
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
missing_string='applications, and their corresponding packages,'
type='applications'
;;
recommended-x-apps)
item_list=$x_recommends
item_string='Recommended X application'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
item_string=''
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
missing_string='applications, and their corresponding packages,'
type='applications'
;;
recommended-apps)
item_list=$recommended_apps
item_string='Recommended application'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
item_string=''
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
missing_string='applications, and their corresponding packages,'
type='applications'
;;
system-dirs)
item_list=$recommended_dirs
item_string='System directory'
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
item_string=''
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
missing_string='system directories'
type='directories'
;;
esac
# great trick from: http://ideatrash.net/2011/01/bash-string-padding-with-sed.html
# left pad: sed -e :a -e 's/^.\{1,80\}$/& /;ta'
# right pad: sed -e :a -e 's/^.\{1,80\}$/ &/;ta'
# center pad: sed -e :a -e 's/^.\{1,80\}$/ & /;ta'
for item in $item_list
do
if [[ $( awk -F ":" '{print NF-1}' <<< $item ) -eq 0 ]];then
application=$item
package=''
feature=''
location=''
elif [[ $( awk -F ":" '{print NF-1}' <<< $item ) -eq 1 ]];then
application=$( cut -d ':' -f 1 <<< $item )
package=''
feature=$( cut -d ':' -f 2 <<< $item )
location=''
else
application=$( cut -d ':' -f 1 <<< $item )
package=$( cut -d ':' -f 2 <<< $item )
location=$( type -p $application )
if [[ $( awk -F ":" '{print NF-1}' <<< $item ) -eq 2 ]];then
feature=$( cut -d ':' -f 3 <<< $item )
else
feature=''
fi
fi
if [[ -n $feature ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_string="$item_string$application (info: $( sed 's/_/ /g' <<< $feature ))"
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
else
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_string="$item_string$application"
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
fi
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
starter="$( sed -e :a -e 's/^.\{1,'$width'\}$/&./;ta' <<< $print_string )"
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
if [[ -z $( grep '^/' <<< $application ) && -n $location ]] || [[ -d $application ]];then
if [[ -n $location ]];then
finisher=" $location"
else
finisher=" Present"
fi
else
finisher=" Missing"
missing_items="$missing_items$separator$application:$package"
separator=' '
fi
echo "$starter$finisher"
done
getting rid of an extra line
2011-06-11 05:19:16 +00:00
echo
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
if [[ -n $missing_items ]];then
echo "The following $type are missing from your system:"
for item in $missing_items
do
application=$( cut -d ':' -f 1 <<< $item )
if [[ $type == 'applications' ]];then
version 1.6.7 Cleaned up recommends, finalized layout, tweaked output, ready to go now as a final I think.
2011-06-11 05:55:44 +00:00
echo
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
package=$( cut -d ':' -f 2 <<< $item )
package_deb=$( cut -d '~' -f 1 <<< $package )
package_pacman=$( cut -d '~' -f 2 <<< $package )
package_rpm=$( cut -d '~' -f 3 <<< $package )
echo "Application: $application"
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "To add to your system, install the proper distribution package for your system:"
print_lines_basic "0" "" "Debian/Ubuntu:^$package_deb^:: Arch Linux:^$package_pacman^:: Redhat/Fedora/Suse:^$package_rpm"
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
else
echo "Directory: $application"
fi
done
if [[ $item_string == 'System directory' ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
print_lines_basic "0" "" "These directories are created by the kernel, so don't worry if they are not present."
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
fi
else
echo "All the $( cut -d ' ' -f 1 <<< $item_string | sed -e 's/Re/re/' -e 's/Sy/sy/' ) $type are present."
fi
echo $Line
}
refactored more, rearranged utility functions
2008-10-28 06:45:56 +00:00
#### -------------------------------------------------------------------
#### print / output cleaners
#### -------------------------------------------------------------------
(Change Version) This is another milestone, hit much sooner than we thought. We have now restored the broken konversation native script support. This will be of special interest to distros who want to include inxi as native, or to packagers. Basically, all that is needed is to set this symbolic link: ln -s <inxi location, ie: /usr/bin/inxi, or /usr/local/bin/inxi> /var/share/apps/konversation/scripts/inxi in the package post install script. This will automatically enable native, ie: /inxi support in konversation. Fixed a few other small bugs, and cleaned up code and comments as well. We were almost going to call this release 1.0.0, but we'll leave that until it's absolutely certain that everything is debugged and working.
2008-11-24 01:46:31 +00:00
# inxi speaks through here. When run by Konversation script alias mode, uses DCOP
# for dcop to work, must use 'say' operator, AND colors must be evaluated by echo -e
# note: dcop does not seem able to handle \n so that's being stripped out and replaced with space.
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
print_screen_output()
refactored more, rearranged utility functions
2008-10-28 06:45:56 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
(Change Version) This is another milestone, hit much sooner than we thought. We have now restored the broken konversation native script support. This will be of special interest to distros who want to include inxi as native, or to packagers. Basically, all that is needed is to set this symbolic link: ln -s <inxi location, ie: /usr/bin/inxi, or /usr/local/bin/inxi> /var/share/apps/konversation/scripts/inxi in the package post install script. This will automatically enable native, ie: /inxi support in konversation. Fixed a few other small bugs, and cleaned up code and comments as well. We were almost going to call this release 1.0.0, but we'll leave that until it's absolutely certain that everything is debugged and working.
2008-11-24 01:46:31 +00:00
# the double quotes are needed to avoid losing whitespace in data when certain output types are used
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
# trim off whitespace at end
local print_data="$( echo -e "$1" )"
(Change Version) This is another milestone, hit much sooner than we thought. We have now restored the broken konversation native script support. This will be of special interest to distros who want to include inxi as native, or to packagers. Basically, all that is needed is to set this symbolic link: ln -s <inxi location, ie: /usr/bin/inxi, or /usr/local/bin/inxi> /var/share/apps/konversation/scripts/inxi in the package post install script. This will automatically enable native, ie: /inxi support in konversation. Fixed a few other small bugs, and cleaned up code and comments as well. We were almost going to call this release 1.0.0, but we'll leave that until it's absolutely certain that everything is debugged and working.
2008-11-24 01:46:31 +00:00
(change version) Removed redundant line printing output for debugger > 5. Why this even existed is beyond me, it does nothing to help debug.
2009-03-17 01:53:02 +00:00
# just using basic debugger stuff so you can tell which thing is printing out the data. This
# should help debug kde 4 konvi issues when that is released into sid, we'll see. Turning off
# the redundant debugger output which as far as I can tell does exactly nothing to help debugging.
Made all if conditionals use the same syntax, [[.....]];then, since we couldn't get rid of all the [[ stuff without getting errors, it should all be the same, so [[....]] it is. Also cleaned up some other cruft and reorganized code slightly.
2008-11-06 19:43:28 +00:00
if [[ $DEBUG -gt 5 ]];then
if [[ $KONVI -eq 1 ]];then
(Change Version) This is another milestone, hit much sooner than we thought. We have now restored the broken konversation native script support. This will be of special interest to distros who want to include inxi as native, or to packagers. Basically, all that is needed is to set this symbolic link: ln -s <inxi location, ie: /usr/bin/inxi, or /usr/local/bin/inxi> /var/share/apps/konversation/scripts/inxi in the package post install script. This will automatically enable native, ie: /inxi support in konversation. Fixed a few other small bugs, and cleaned up code and comments as well. We were almost going to call this release 1.0.0, but we'll leave that until it's absolutely certain that everything is debugged and working.
2008-11-24 01:46:31 +00:00
# konvi doesn't seem to like \n characters, it just prints them literally
(change version) Removed redundant line printing output for debugger > 5. Why this even existed is beyond me, it does nothing to help debug.
2009-03-17 01:53:02 +00:00
# print_data="$( tr '\n' ' ' <<< "$print_data" )"
# dcop "$DCPORT" "$DCOPOBJ" say "$DCSERVER" "$DCTARGET" "konvi='$KONVI' saying : '$print_data'"
print_data="KP-$KONVI: $print_data"
(Change Version) This is another milestone, hit much sooner than we thought. We have now restored the broken konversation native script support. This will be of special interest to distros who want to include inxi as native, or to packagers. Basically, all that is needed is to set this symbolic link: ln -s <inxi location, ie: /usr/bin/inxi, or /usr/local/bin/inxi> /var/share/apps/konversation/scripts/inxi in the package post install script. This will automatically enable native, ie: /inxi support in konversation. Fixed a few other small bugs, and cleaned up code and comments as well. We were almost going to call this release 1.0.0, but we'll leave that until it's absolutely certain that everything is debugged and working.
2008-11-24 01:46:31 +00:00
elif [[ $KONVI -eq 2 ]];then
(change version) Removed redundant line printing output for debugger > 5. Why this even existed is beyond me, it does nothing to help debug.
2009-03-17 01:53:02 +00:00
# echo "konvi='$KONVI' saying : '$print_data'"
print_data="KP-$KONVI: $print_data"
patched, dcop in theory would now work in konversation script launch, otherwise I'll leave this alone for now
2008-10-29 02:35:42 +00:00
else
(change version) Removed redundant line printing output for debugger > 5. Why this even existed is beyond me, it does nothing to help debug.
2009-03-17 01:53:02 +00:00
# echo "printing out: '$print_data'"
print_data="P: $print_data"
patched, dcop in theory would now work in konversation script launch, otherwise I'll leave this alone for now
2008-10-29 02:35:42 +00:00
fi
refactored more, rearranged utility functions
2008-10-28 06:45:56 +00:00
fi
Change version: Bug fix, added in globals B_DCOP / B_QDBUS for pretests of dcop/qdbus. Need to set both because some systems have both. Bug fix, added squashfs and unionfs to excluded fs types to clean up -p output for partition data
2010-06-11 03:44:19 +00:00
if [[ $KONVI -eq 1 && $B_DCOP == 'true' ]]; then ## dcop Konversation (<= 1.1 (qt3))
(change version) Removed redundant line printing output for debugger > 5. Why this even existed is beyond me, it does nothing to help debug.
2009-03-17 01:53:02 +00:00
# konvi doesn't seem to like \n characters, it just prints them literally
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
$print_data="$( tr '\n' ' ' <<< "$print_data" )"
(Change Version) This is another milestone, hit much sooner than we thought. We have now restored the broken konversation native script support. This will be of special interest to distros who want to include inxi as native, or to packagers. Basically, all that is needed is to set this symbolic link: ln -s <inxi location, ie: /usr/bin/inxi, or /usr/local/bin/inxi> /var/share/apps/konversation/scripts/inxi in the package post install script. This will automatically enable native, ie: /inxi support in konversation. Fixed a few other small bugs, and cleaned up code and comments as well. We were almost going to call this release 1.0.0, but we'll leave that until it's absolutely certain that everything is debugged and working.
2008-11-24 01:46:31 +00:00
dcop "$DCPORT" "$DCOPOBJ" say "$DCSERVER" "$DCTARGET" "$print_data"
Change version: Bug fix, added in globals B_DCOP / B_QDBUS for pretests of dcop/qdbus. Need to set both because some systems have both. Bug fix, added squashfs and unionfs to excluded fs types to clean up -p output for partition data
2010-06-11 03:44:19 +00:00
elif [[ $KONVI -eq 3 && $B_QDBUS == 'true' ]]; then ## dbus Konversation (> 1.2 (qt4))
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
qdbus org.kde.konversation /irc say "$DCSERVER" "$DCTARGET" "$print_data"
# elif [[ $IRC_CLIENT == 'X-Chat' ]]; then
# qdbus org.xchat.service print "$print_data\n"
patched, dcop in theory would now work in konversation script launch, otherwise I'll leave this alone for now
2008-10-29 02:35:42 +00:00
else
(no version change) Added comment explanation for echo -ne main print
2008-11-24 04:46:00 +00:00
# the -n is needed to avoid double spacing of output in terminal
(Change Version) Bug fix, caused extra line space in terminal.
2008-11-24 04:43:27 +00:00
echo -ne "$print_data\n"
patched, dcop in theory would now work in konversation script launch, otherwise I'll leave this alone for now
2008-10-29 02:35:42 +00:00
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
refactored more, rearranged utility functions
2008-10-28 06:45:56 +00:00
}
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
## this handles all verbose line construction with indentation/line starter
## args: $1 - null (, actually: " ") or line starter; $2 - line content
Tweaked output, fixed bugs, mostly done with major refactoring now
2008-10-29 23:02:24 +00:00
create_print_line()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
local line=${2% } #trim off trailing space if present, note: ${CN} may hide the actual trailing end space
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
printf "${C1}%-${INDENT}s${C2} %s" "$1" "$line"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Tweaked output, fixed bugs, mostly done with major refactoring now
2008-10-29 23:02:24 +00:00
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
# this removes newline and pipes.
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
# args: $1 - string to clean
replaced eat() with remove_errooneous_characters function by trash80
2008-10-28 06:35:45 +00:00
remove_erroneous_chars()
Initial setup of repo
2008-10-28 00:40:43 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
small tweaks
2008-10-28 07:28:50 +00:00
## RS is input record separator
## gsub is substitute;
fixed a few small errors
2008-11-06 21:03:19 +00:00
gawk '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
RS=""
}
{
gawk code cleanup, got rid of all one line flow controls, got rid of all ; separated statements, made all gawk code line up with columns it occurs in.
2008-11-06 20:58:35 +00:00
gsub(/\n$/,"") ## (newline; end of string) with (nothing)
gsub(/\n/," "); ## (newline) with (space)
gsub(/^ *| *$/, "") ## (pipe char) with (nothing)
gsub(/ +/, " ") ## ( +) with (space)
gsub(/ [ ]+/, " ") ## ([ ]+) with (space)
gsub(/^ +| +$/, "") ## (pipe char) with (nothing)
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
printf $0
gawk code cleanup, got rid of all one line flow controls, got rid of all ; separated statements, made all gawk code line up with columns it occurs in.
2008-11-06 20:58:35 +00:00
}' "$1" ## prints (returns) cleaned input
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Initial setup of repo
2008-10-28 00:40:43 +00:00
}
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
#### -------------------------------------------------------------------
#### parameter handling, print usage functions.
#### -------------------------------------------------------------------
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
Redid get_parameters to use getops single letter method, this is cleaner and easier to maintain and test for. Added options -c for color scheme, -d for default (same as previous -v1 or -v), -T testing, allows trigger of experimental new methods or outputs or functions.
2008-11-01 21:24:45 +00:00
# Get the parameters. Note: standard options should be lower case, advanced or testing, upper
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
# args: $1 - full script startup args: $@
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
get_parameters()
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
local opt='' wget_test='' debug_data_type='' weather_flag='wW:'
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
local use_short='true' # this is needed to trigger short output, every v/d/F/line trigger sets this false
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
# if distro maintainers don't want the weather feature disable it
if [[ $B_ALLOW_WEATHER == 'false' ]];then
weather_flag=''
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
(Change version) Added new distro maintainer flag: B_ALLOW_UPDATE='true' as default. If set to false, it will shut off the inxi script updating feature, and also turn off the display in -h of the -U option. This seems a lot easier than having to remove code each release, which would get fairly tiresome.
2008-11-13 19:27:48 +00:00
fi
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
if [[ $1 == '--version' ]];then
print_version_info
exit 0
elif [[ $1 == '--help' ]];then
show_options
exit 0
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
elif [[ $1 == '--recommends' ]];then
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
check_recommends_user_output
1.6.6 new option: --recommends This lets users check their system for all the required/recommended apps, and also shows any missing core directories, with an explanation of what each item does. Also prints out a list of distro packages that should help users install the missing package. So far only debian/ubuntu and arch linux lists are done.
2011-06-10 23:07:01 +00:00
exit 0
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
# the short form only runs if no args output args are used
# no need to run through these if there are no args
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
# reserved for future use: -g for extra Graphics; -m for extra Machine; -d for extra Disk
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
elif [[ -n $1 ]];then
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
while getopts Abc:CdDfFGhHiIlMnNopPrRsSt:uUv:V${weather_flag}xzZ%@:!: opt
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
do
case $opt in
A) B_SHOW_AUDIO='true'
use_short='false'
;;
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
b) use_short='false'
B_SHOW_BASIC_CPU='true'
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
B_SHOW_BASIC_RAID='true'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
B_SHOW_DISK_TOTAL='true'
B_SHOW_GRAPHICS='true'
B_SHOW_INFO='true'
first finalizing version
2011-06-18 03:17:05 +00:00
B_SHOW_MACHINE='true'
B_SHOW_NETWORK='true'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
B_SHOW_SYSTEM='true'
;;
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
c) if [[ -n $( grep -E '^[0-9][0-9]?$' <<< $OPTARG ) ]];then
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
case $OPTARG in
99)
B_RUN_COLOR_SELECTOR='true'
COLOR_SELECTION='global'
;;
98)
B_RUN_COLOR_SELECTOR='true'
COLOR_SELECTION='irc-console'
;;
97)
B_RUN_COLOR_SELECTOR='true'
COLOR_SELECTION='irc-virtual-terminal'
;;
96)
B_RUN_COLOR_SELECTOR='true'
COLOR_SELECTION='irc'
;;
95)
B_RUN_COLOR_SELECTOR='true'
COLOR_SELECTION='virtual-terminal'
;;
94)
B_RUN_COLOR_SELECTOR='true'
COLOR_SELECTION='console'
;;
*)
B_COLOR_SCHEME_SET='true'
## note: not sure about this, you'd think user values should be overridden, but
## we'll leave this for now
if [[ -z $COLOR_SCHEME ]];then
set_color_scheme "$OPTARG"
fi
;;
esac
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
else
error_handler 3 "$OPTARG"
Redid get_parameters to use getops single letter method, this is cleaner and easier to maintain and test for. Added options -c for color scheme, -d for default (same as previous -v1 or -v), -T testing, allows trigger of experimental new methods or outputs or functions.
2008-11-01 21:24:45 +00:00
fi
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
;;
C) B_SHOW_CPU='true'
use_short='false'
;;
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
d) B_SHOW_DISK='true'
fixed a bug
2011-06-18 03:49:53 +00:00
B_SHOW_FULL_OPTICAL='true'
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
use_short='false'
# error_handler 20 "-d has been replaced by -b"
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
;;
D) B_SHOW_DISK='true'
use_short='false'
;;
f) B_SHOW_CPU='true'
B_CPU_FLAGS_FULL='true'
use_short='false'
;;
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
F) # B_EXTRA_DATA='true'
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
B_SHOW_ADVANCED_NETWORK='true'
B_SHOW_AUDIO='true'
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
# B_SHOW_BASIC_OPTICAL='true'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
B_SHOW_CPU='true'
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
B_SHOW_DISK='true'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
B_SHOW_GRAPHICS='true'
B_SHOW_INFO='true'
B_SHOW_MACHINE='true'
B_SHOW_NETWORK='true'
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
B_SHOW_PARTITIONS='true'
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
B_SHOW_RAID='true'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
B_SHOW_SENSORS='true'
B_SHOW_SYSTEM='true'
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
use_short='false'
;;
G) B_SHOW_GRAPHICS='true'
use_short='false'
;;
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
i) B_SHOW_IP='true'
B_SHOW_NETWORK='true'
made -i also show -n
2011-05-26 01:53:17 +00:00
B_SHOW_ADVANCED_NETWORK='true'
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
use_short='false'
;;
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
I) B_SHOW_INFO='true'
use_short='false'
;;
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
l) B_SHOW_LABELS='true'
B_SHOW_PARTITIONS='true'
use_short='false'
;;
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
M) B_SHOW_MACHINE='true'
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
use_short='false'
;;
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
n) B_SHOW_ADVANCED_NETWORK='true'
B_SHOW_NETWORK='true'
use_short='false'
;;
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
N) B_SHOW_NETWORK='true'
use_short='false'
;;
cleaned some spacing errors.
2011-10-22 05:12:05 +00:00
o) B_SHOW_UNMOUNTED_PARTITIONS='true'
(change version) new feature and option: -o shows unmounted local partitions, with uuid and label if present. Does not show with -F to avoid excessive output
2010-01-09 04:05:21 +00:00
use_short='false'
;;
(Change version) New option -p, outputs all discovered partition information along with the -P stuff. -P was improved to also show /tmp and /usr by default. -p will not show with -F to avoid flooding issues.
2008-12-03 23:14:21 +00:00
p) B_SHOW_PARTITIONS_FULL='true'
B_SHOW_PARTITIONS='true'
use_short='false'
;;
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
P) B_SHOW_PARTITIONS='true'
use_short='false'
;;
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
r) B_SHOW_REPOS='true'
use_short='false'
;;
Added man pages, including the gz part. No idea why I forgot to do this, this is by aus9 by the way. So there's the man pages, needs some work, but at least it's something.
2012-05-06 23:38:13 +00:00
R) B_SHOW_RAID='true'
By suggestion and good sense, -R has been modified. New tarball as well. Now RAID works like this: -b - if no /proc/mdstat, or if no devices found and module is running, show nothing, otherwise show short form as before -F - if no proc/mdstat, show nothing, if no devices but mdstat and if -xx, show all lines, otherwise show normal -R - show all messages and missing file/module information so users, particularly sys admins, know right away module is running even if no devices. -v 6 and less, like -F. -v 7, like -R run, ie, show all messages. this gets rid of unneeded line output given that only if you have md_mod running will you have any data for /proc/mdstat and that module is only running if you have mdraid installed. Also redid the no data messages for no module state and no devices state to better reflect what is actually happening. Good adjustment and good cleanup of unneeded output while tightening the actual usability of the specific messages received.
2012-05-15 01:51:58 +00:00
# it turns out only users with mdraid software installed will have raid,
# so unless -R is explicitly called, blank -b/-F/-v6 and less output will not show
# error if file is missing.
B_SHOW_RAID_R='true'
Added man pages, including the gz part. No idea why I forgot to do this, this is by aus9 by the way. So there's the man pages, needs some work, but at least it's something.
2012-05-06 23:38:13 +00:00
use_short='false'
;;
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
s) B_SHOW_SENSORS='true'
use_short='false'
;;
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
S) B_SHOW_SYSTEM='true'
use_short='false'
;;
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
t) if [[ -n $( grep -E '^(c|m|cm|mc)([1-9]|1[0-9]|20)?$' <<< $OPTARG ) ]];then
use_short='false'
if [[ -n $( grep -E '[0-9]+' <<< $OPTARG ) ]];then
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
PS_COUNT=$( sed 's/[^0-9]//g' <<< $OPTARG )
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
fi
if [[ -n $( grep 'c' <<< $OPTARG ) ]];then
B_SHOW_PS_CPU_DATA='true'
fi
if [[ -n $( grep 'm' <<< $OPTARG ) ]];then
B_SHOW_PS_MEM_DATA='true'
fi
else
error_handler 13 "$OPTARG"
fi
;;
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
u) B_SHOW_UUIDS='true'
B_SHOW_PARTITIONS='true'
use_short='false'
;;
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
v) if [[ -n $( grep -E "^[0-9][0-9]?$" <<< $OPTARG ) && $OPTARG -le $VERBOSITY_LEVELS ]];then
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $OPTARG -ge 1 ]];then
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
use_short='false'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
B_SHOW_BASIC_CPU='true'
B_SHOW_DISK_TOTAL='true'
B_SHOW_GRAPHICS='true'
B_SHOW_INFO='true'
B_SHOW_SYSTEM='true'
fi
if [[ $OPTARG -ge 2 ]];then
B_SHOW_BASIC_DISK='true'
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
B_SHOW_BASIC_RAID='true'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
B_SHOW_MACHINE='true'
B_SHOW_NETWORK='true'
fi
if [[ $OPTARG -ge 3 ]];then
B_SHOW_ADVANCED_NETWORK='true'
B_SHOW_CPU='true'
B_EXTRA_DATA='true'
fi
if [[ $OPTARG -ge 4 ]];then
B_SHOW_DISK='true'
B_SHOW_PARTITIONS='true'
fi
if [[ $OPTARG -ge 5 ]];then
B_SHOW_AUDIO='true'
fixed a bug
2011-06-18 03:49:53 +00:00
B_SHOW_BASIC_OPTICAL='true'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
B_SHOW_SENSORS='true'
B_SHOW_LABELS='true'
B_SHOW_UUIDS='true'
Added man pages, including the gz part. No idea why I forgot to do this, this is by aus9 by the way. So there's the man pages, needs some work, but at least it's something.
2012-05-06 23:38:13 +00:00
B_SHOW_RAID='true'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
fi
if [[ $OPTARG -ge 6 ]];then
fixed a bug
2011-06-18 03:49:53 +00:00
B_SHOW_FULL_OPTICAL='true'
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
B_SHOW_PARTITIONS_FULL='true'
B_SHOW_UNMOUNTED_PARTITIONS='true'
by special Mint request, adding shell/panel type extra extra extra output to desktop, this is so easy to do I decided to just add an -xxx option, for extra extra extra data, no output if nothing detected. No big support issues, and Mint has used inxi by default for a while, so I think it's fine to add this for them.
2012-06-24 08:30:14 +00:00
B_EXTRA_EXTRA_DATA='true'
(Change Version) This is now launching inxi as an official script. Changed the default download url to get it directly from google svn. This means that users can always reference the official svn copy to ensure that the code is what it claims to be. Added for development purposes new advanced testing options: -! 1 triggers the boolean testing flag -! 2 triggers an alternative development download -! http://<any website>/path_to_download_directory/ (note: must end in /, and not include inxi file name Updated the script_self_updater function to handle variable download urls, and added an update message that lets the person know where the update source was. Added error handler for user provided testing download urls, if not existing, exit. And with this, I'm handing over control to the inxi project itself.
2008-11-11 18:37:09 +00:00
fi
added verbosity level 7, that addes -i and -xx
2011-07-08 21:16:19 +00:00
if [[ $OPTARG -ge 7 ]];then
by special Mint request, adding shell/panel type extra extra extra output to desktop, this is so easy to do I decided to just add an -xxx option, for extra extra extra data, no output if nothing detected. No big support issues, and Mint has used inxi by default for a while, so I think it's fine to add this for them.
2012-06-24 08:30:14 +00:00
B_EXTRA_EXTRA_EXTRA_DATA='true'
added verbosity level 7, that addes -i and -xx
2011-07-08 21:16:19 +00:00
B_SHOW_IP='true'
By suggestion and good sense, -R has been modified. New tarball as well. Now RAID works like this: -b - if no /proc/mdstat, or if no devices found and module is running, show nothing, otherwise show short form as before -F - if no proc/mdstat, show nothing, if no devices but mdstat and if -xx, show all lines, otherwise show normal -R - show all messages and missing file/module information so users, particularly sys admins, know right away module is running even if no devices. -v 6 and less, like -F. -v 7, like -R run, ie, show all messages. this gets rid of unneeded line output given that only if you have md_mod running will you have any data for /proc/mdstat and that module is only running if you have mdraid installed. Also redid the no data messages for no module state and no devices state to better reflect what is actually happening. Good adjustment and good cleanup of unneeded output while tightening the actual usability of the specific messages received.
2012-05-15 01:51:58 +00:00
B_SHOW_RAID_R='true'
added verbosity level 7, that addes -i and -xx
2011-07-08 21:16:19 +00:00
fi
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
else
error_handler 4 "$OPTARG"
fi
;;
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
U) if [[ $B_ALLOW_UPDATE == 'true' ]];then
script_self_updater "$SCRIPT_DOWNLOAD" 'svn server' "$opt"
else
error_handler 17 "-$opt"
fi
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
;;
V) print_version_info
exit 0
;;
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
w) B_SHOW_WEATHER=true
use_short='false'
;;
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
W) ALTERNATE_WEATHER_LOCATION=$( sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' <<< $OPTARG )
if [[ -n $( grep -Esi '([^,]+,.+|[0-9-]+)' <<< $ALTERNATE_WEATHER_LOCATION ) ]];then
B_SHOW_WEATHER=true
use_short='false'
else
error_handler 18 "-$opt: '$OPTARG'" "city,state OR latitude,longitude OR postal/zip code."
fi
;;
by special Mint request, adding shell/panel type extra extra extra output to desktop, this is so easy to do I decided to just add an -xxx option, for extra extra extra data, no output if nothing detected. No big support issues, and Mint has used inxi by default for a while, so I think it's fine to add this for them.
2012-06-24 08:30:14 +00:00
# this will trigger either with x, xx, xxx or with Fx but not with xF
x) if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
B_EXTRA_EXTRA_EXTRA_DATA='true'
elif [[ $B_EXTRA_DATA == 'true' ]];then
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
B_EXTRA_EXTRA_DATA='true'
by special Mint request, adding shell/panel type extra extra extra output to desktop, this is so easy to do I decided to just add an -xxx option, for extra extra extra data, no output if nothing detected. No big support issues, and Mint has used inxi by default for a while, so I think it's fine to add this for them.
2012-06-24 08:30:14 +00:00
else
B_EXTRA_DATA='true'
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
fi
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
;;
cleaned some spacing errors.
2011-10-22 05:12:05 +00:00
z) B_OUTPUT_FILTER='true'
1.5.2: new options: -z, triggers output filtering. This is default on for irc client output. -Z - absolute override, turns off all filtering. This is useful if you are helping someone on irc for example and need to see this data. Fixed a long term bug in the regex that filtered out home name from mount paths in partitions, was greedy, now it just filters out only the name and prints the rest of the full path, as it should. Added twm to desktop support list, that has no --version output so that won't show.
2011-05-24 20:47:22 +00:00
;;
Z) B_OVERRIDE_FILTER='true'
;;
(Change version) Added more useful -H option, now triggers advanced testing option display as well as regular help
2008-11-19 19:57:14 +00:00
h) show_options
exit 0
;;
H) show_options 'full'
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
exit 0
;;
## debuggers and testing tools
%) B_HANDLE_CORRUPT_DATA='true'
;;
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
@) if [[ -n $( grep -E "^([1-9]|1[0-4])$" <<< $OPTARG ) ]];then
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
DEBUG=$OPTARG
first patch to have auto upload of user debugging data to techpatterns.com ftp server, anon
2011-06-21 22:41:06 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
B_UPLOAD_DEBUG_DATA='true'
fi
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
exec 2>&1
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
# switch on logging only for -@ 8-10
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
case $OPTARG in
8|9|10)
if [[ $OPTARG -eq 10 ]];then
B_LOG_COLORS='true'
elif [[ $OPTARG -eq 9 ]];then
B_LOG_FULL_DATA='true'
fi
B_USE_LOGGING='true'
# pack the logging data for evals function start/end
LOGFS=$LOGFS_STRING
LOGFE=$LOGFE_STRING
create_rotate_logfiles # create/rotate logfiles before we do anything else
;;
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
11|12|13|14)
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
case $OPTARG in
11)
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
debug_data_type='sys'
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
;;
12)
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
debug_data_type='xorg'
;;
13)
debug_data_type='disk'
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
;;
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
14)
debug_data_type='all'
;;
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
esac
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
initialize_data
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
debug_data_collector $debug_data_type
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
;;
esac
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
else
error_handler 9 "$OPTARG"
fi
;;
!) # test for various supported methods
case $OPTARG in
(No Version Change) Changed B_TESTING_FLAG to B_TESTING_1 to cover future cases where we run multiple testing option flags. These last changes are all for future development, none are related to currently active stuff.
2008-11-13 02:40:01 +00:00
1) B_TESTING_1='true'
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
;;
(Change Version) More future proofing, updated -! conditions to use more reasonable numbers: 1,2,3 -! are now setting testing booleans 10,11,12,http://.... now set alt downloads
2008-11-13 02:45:35 +00:00
2) B_TESTING_2='true'
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
;;
(Change Version) More future proofing, updated -! conditions to use more reasonable numbers: 1,2,3 -! are now setting testing booleans 10,11,12,http://.... now set alt downloads
2008-11-13 02:45:35 +00:00
3) B_TESTING_1='true'
B_TESTING_2='true'
(change version) Added two new testing options, svn branch one and branch two download run from urls. Both are triggered by -!, -! 3 for testing branch/one and -! 4 for testing branch/two
2008-11-13 01:57:45 +00:00
;;
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
1[0-6]|http*)
if [[ $B_ALLOW_UPDATE == 'true' ]];then
case $OPTARG in
10)
script_self_updater "$SCRIPT_DOWNLOAD_DEV" 'dev server' "$opt $OPTARG"
;;
11)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_1" 'svn: branch one server' "$opt $OPTARG"
;;
12)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_2" 'svn: branch two server' "$opt $OPTARG"
;;
13)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_3" 'svn: branch three server' "$opt $OPTARG"
;;
14)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_4" 'svn: branch four server' "$opt $OPTARG"
;;
15)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_BSD" 'svn: branch bsd server' "$opt $OPTARG"
;;
16)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_GNUBSD" 'svn: branch gnubsd server' "$opt $OPTARG"
;;
http*)
script_self_updater "$OPTARG" 'alt server' "$opt <http...>"
;;
esac
else
error_handler 17 "-$opt $OPTARG"
fi
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
;;
trying to add -! 30 to trick inxi into thinking it is running in shell
2013-01-11 20:22:05 +00:00
30)
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
B_IRC='false'
trying to add -! 30 to trick inxi into thinking it is running in shell
2013-01-11 20:22:05 +00:00
;;
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
31)
B_SHOW_HOST='false'
;;
32)
B_SHOW_HOST='true'
;;
added debugging option -! ftp.<alternate ftp upload location> just so it's not restricted to ftp.techpatterns.com
2011-06-27 18:40:42 +00:00
ftp*)
ALTERNATE_FTP="$OPTARG"
;;
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
# for weather function, allows user to set an alternate weather location
location=*)
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
error_handler 19 "-$opt location=" "-W"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
;;
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
*) error_handler 11 "$OPTARG"
;;
esac
;;
*) error_handler 7 "$1"
;;
(Change Version) This is now launching inxi as an official script. Changed the default download url to get it directly from google svn. This means that users can always reference the official svn copy to ensure that the code is what it claims to be. Added for development purposes new advanced testing options: -! 1 triggers the boolean testing flag -! 2 triggers an alternative development download -! http://<any website>/path_to_download_directory/ (note: must end in /, and not include inxi file name Updated the script_self_updater function to handle variable download urls, and added an update message that lets the person know where the update source was. Added error handler for user provided testing download urls, if not existing, exit. And with this, I'm handing over control to the inxi project itself.
2008-11-11 18:37:09 +00:00
esac
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
done
fi
(Change Version) Final step: moved the error output switch to end of get_parameters. This lets you trigger the debugger -@ <debug number> flag without having to actually alter the code of inxi manually. This might occasionally create undesired error output, but that's a good thing, since that error output should be seen so we can know what the error is.
2008-11-11 19:34:25 +00:00
## this must occur here so you can use the debugging flag to show errors
## Reroute all error messages to the bitbucket (if not debugging)
if [[ $DEBUG -eq 0 ]];then
exec 2>/dev/null
fi
#((DEBUG)) && exec 2>&1 # This is for debugging konversation
(Change Version) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
# after all the args have been processed, if no long output args used, run short output
if [[ $use_short == 'true' ]];then
B_SHOW_SHORT_OUTPUT='true'
fi
1.5.2: new options: -z, triggers output filtering. This is default on for irc client output. -Z - absolute override, turns off all filtering. This is useful if you are helping someone on irc for example and need to see this data. Fixed a long term bug in the regex that filtered out home name from mount paths in partitions, was greedy, now it just filters out only the name and prints the rest of the full path, as it should. Added twm to desktop support list, that has no --version output so that won't show.
2011-05-24 20:47:22 +00:00
# just in case someone insists on using -zZ
if [[ $B_OVERRIDE_FILTER == 'true' ]];then
B_OUTPUT_FILTER='false'
fi
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
# change basic to full if user requested it or if arg overrides it
if [[ $B_SHOW_RAID == 'true' && $B_SHOW_BASIC_RAID == 'true' ]];then
B_SHOW_BASIC_RAID='false'
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Initial setup of repo
2008-10-28 00:40:43 +00:00
}
Redid get_parameters to use getops single letter method, this is cleaner and easier to maintain and test for. Added options -c for color scheme, -d for default (same as previous -v1 or -v), -T testing, allows trigger of experimental new methods or outputs or functions.
2008-11-01 21:24:45 +00:00
## print out help menu, not including Testing or Debugger stuff because it's not needed
added help menu, -h and --help
2008-10-29 03:22:16 +00:00
show_options()
{
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
local color_scheme_count=$(( ${#A_COLOR_SCHEMES[@]} - 1 ))
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
local partition_string='partition' partition_string_u='Partition'
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'true' ]];then
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
print_screen_output "Sorry, you can't run the help option in an IRC client."
exit 1
fi
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
if [[ -n $BSD_TYPE ]];then
partition_string='slice'
partition_string_u='Slice'
fi
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
# print_lines_basic "0" "" ""
# print_lines_basic "1" "" ""
# print_lines_basic "2" "" ""
# print_screen_output " "
print_lines_basic "0" "" "$SCRIPT_NAME supports the following options. You can combine them, or list them one by one. Examples: $SCRIPT_NAME^-v4^-c6 OR $SCRIPT_NAME^-bDc^6. If you start $SCRIPT_NAME with no arguments, it will show the short form."
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
print_screen_output " "
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_lines_basic "0" "" "The following options if used without -F, -b, or -v will show just option line(s): A, C, D, G, I, M, N, P, R, S, f, i, n, o, p, l, u, r, s, t - you can use these alone or together to show just the line(s) you want to see. If you use them with -v^[level], -b or -F, it will show the full output for that line along with the output for the chosen verbosity level."
More small tweaks to things
2008-10-31 04:31:56 +00:00
print_screen_output "- - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
(Change Version Number) Updated help menu to better explain this new system, and split it into two parts: 1. output control 2. additional options This makes it easier to read and understand.
2008-11-10 23:08:07 +00:00
print_screen_output "Output Control Options:"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "-A" "Audio/sound card information."
print_lines_basic "1" "-b" "Basic output, short form. Like $SCRIPT_NAME^-v^2, only minus hard disk names."
print_lines_basic "1" "-c" "Color schemes. Scheme number is required. Color selectors run a color selector option prior to $SCRIPT_NAME starting which lets you set the config file value for the selection."
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_lines_basic "1" "" "Supported color schemes: 0-$color_scheme_count Example:^$SCRIPT_NAME^-c^11"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "" "Color selectors for each type display (NOTE: irc and global only show safe color set):"
# print_screen_output " Supported color schemes: 0-$color_scheme_count Example: $SCRIPT_NAME -c 11"
# print_screen_output " Color selectors for each type display (NOTE: irc and global only show safe color set):"
print_lines_basic "2" "94" "Console, out of X"
print_lines_basic "2" "95" "Terminal, running in X - like xTerm"
print_lines_basic "2" "96" "Gui IRC, running in X - like Xchat, Quassel, Konversation etc."
print_lines_basic "2" "97" "Console IRC running in X - like irssi in xTerm"
print_lines_basic "2" "98" "Console IRC not in X"
print_lines_basic "2" "99" "Global - Overrides/removes all settings. Setting specific removes global."
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
print_lines_basic "1" "-C" "CPU output, including per CPU clockspeed (if available)."
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "-d" "Optical drive data. Same as -Dd. See also -x and -xx."
print_lines_basic "1" "-D" "Full hard Disk info, not only model, ie: /dev/sda ST380817AS 80.0GB. See also -x and -xx."
print_lines_basic "1" "-f" "All cpu flags, triggers -C. Not shown with -F to avoid spamming. ARM cpus show 'features'."
print_lines_basic "1" "-F" "Full output for $SCRIPT_NAME. Includes all Upper Case line letters, plus -s and -n. Does not show extra verbose options like -x -d -f -u -l -o -p -t -r"
print_lines_basic "1" "-G" "Graphic card information (card, display server type/version, resolution, glx renderer, version)."
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_lines_basic "1" "-i" "Wan IP address, and shows local interfaces (requires ifconfig
network tool). Same as -Nni. Not shown with -F for user security reasons, you shouldn't paste your local/wan IP."
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "-I" "Information: processes, uptime, memory, irc client (or shell type), $SCRIPT_NAME version."
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_lines_basic "1" "-l" "$partition_string_u labels. Default: short $partition_string -P. For full -p output, use: -pl (or -plu)."
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "-M" "Machine data. Motherboard, Bios, and if present, System Builder (Like Lenovo). Older systems/kernels without the required /sys data can use dmidecode instead, run as root."
print_lines_basic "1" "-n" "Advanced Network card information. Same as -Nn. Shows interface, speed, mac id, state, etc."
print_lines_basic "1" "-N" "Network card information. With -x, shows PCI BusID, Port number."
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
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."
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "-r" "Distro repository data. Supported repo types: APT; PACMAN; PISI; YUM; URPMQ; Ports."
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"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_lines_basic "1" "-t" "Processes. Requires extra options: c^(cpu) m^(memory) cm^(cpu+memory). If followed by numbers 1-20, shows that number of processes for each type (default:^$PS_COUNT; if in irc, max:^5): -t^cm10"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "" "Make sure to have no space between letters and numbers (-t^cm10 - right, -t^cm^10 - wrong)."
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_lines_basic "1" "-u" "$partition_string_u UUIDs. Default: short $partition_string -P. For full -p output, use: -pu (or -plu)."
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "-v" "Script verbosity levels. Verbosity level number is required. Should not be used with -b or -F"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_lines_basic "1" "" "Supported levels: 0-$VERBOSITY_LEVELS Example: $SCRIPT_NAME^-v^4"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "2" "0" "Short output, same as: $SCRIPT_NAME"
print_lines_basic "2" "1" "Basic verbose, -S + basic CPU + -G + basic Disk + -I."
print_lines_basic "2" "2" "Networking card (-N), Machine (-M) data, shows basic hard disk data (names only), and, if present, basic raid (devices only, and if inactive, notes that). similar to: $SCRIPT_NAME^-b"
print_lines_basic "2" "3" "Advanced CPU (-C), network (-n) data, and switches on -x advanced data option."
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_lines_basic "2" "4" "$partition_string_u size/filled data (-P) for (if present): /, /home, /var/, /boot. Shows full disk data (-D)."
print_lines_basic "2" "5" "Audio card (-A); sensors^(-s), $partition_string label^(-l) and UUID^(-u), short form of optical drives, standard raid data (-R)."
print_lines_basic "2" "6" "Full $partition_string (-p), unmounted $partition_string (-o), optical drive (-d), full raid; triggers -xx."
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "2" "7" "Network IP data (-i); triggers -xxx."
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
# if distro maintainers don't want the weather feature disable it
if [[ $B_ALLOW_WEATHER == 'true' ]];then
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "-w" "Local weather data/time. To check an alternate location, see: -W^<location>. For extra weather data options see -x, -xx, and -xxx."
a few more help menu tweaks to make things line up right.
2014-03-14 04:49:12 +00:00
print_lines_basic "1" "-W" "<location> Supported options for <location>: postal code; city, state/country; latitude/longitude. Only use if you want the weather somewhere other than the machine running $SCRIPT_NAME. Use only ascii characters, replace spaces in city/state/country names with '+'. Example:^$SCRIPT_NAME^-W^new+york,ny"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
fi
print_lines_basic "1" "-x" "Adds the following extra data (only works with verbose or line output, not short form):"
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
print_lines_basic "2" "-C" "CPU Flags, Bogomips on Cpu;"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "2" "-d" "Extra optical drive data; adds rev version to optical drive."
a few more help menu tweaks to make things line up right.
2014-03-14 04:49:12 +00:00
print_lines_basic "2" "-D" "Hdd temp with disk data if you have hddtemp installed, if you are root OR if you have added to /etc/sudoers (sudo v. 1.7 or newer) Example:^<username>^ALL^=^NOPASSWD:^/usr/sbin/hddtemp"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "2" "-G" "Direct rendering status for Graphics (in X)."
print_lines_basic "2" "-G" "(for single gpu, nvidia driver) screen number gpu is running on."
print_lines_basic "2" "-i" "IPv6 as well for LAN interface (IF) devices."
print_lines_basic "2" "-I" "System GCC, default. With -xx, also show other installed GCC versions. If running in console, not in IRC client, shows shell version number, if detected. Init/RC Type and runlevel (if available)."
print_lines_basic "2" "-N -A" "Version/port(s)/driver version (if available) for Network/Audio;"
print_lines_basic "2" "-N -A -G" "Network, audio, graphics, shows PCI Bus ID/Usb ID number of card."
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_lines_basic "2" "-R" "md-raid: Shows component raid id. Adds second RAID Info line: raid level; report on drives (like 5/5); blocks; chunk size; bitmap (if present). Resync line, shows blocks synced/total blocks. zfs-raid: Shows raid array full size; available size; portion allocated to RAID"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "2" "-S" "Desktop toolkit if avaliable (GNOME/XFCE/KDE only); Kernel gcc version"
print_lines_basic "2" "-t" "Memory use output to cpu (-xt c), and cpu use to memory (-xt m)."
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
if [[ $B_ALLOW_WEATHER == 'true' ]];then
fixed a small thing with -w/-W in help
2014-03-14 04:26:43 +00:00
print_lines_basic "2" "-w -W" "Wind speed and time zone (-w only)."
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
fi
print_lines_basic "1" "-xx" "Show extra, extra data (only works with verbose or line output, not short form):"
print_lines_basic "2" "-A" "Chip vendor:product ID for each audio device."
print_lines_basic "2" "-D" "Disk serial number."
print_lines_basic "2" "-G" "Chip vendor:product ID for each video card."
print_lines_basic "2" "-I" "Other detected installed gcc versions (if present). System default runlevel. Adds parent program (or tty) for shell info if not in IRC (like Konsole or Gterm). Adds Init/RC (if found) version number."
print_lines_basic "2" "-M" "Chassis information, bios rom size (dmidecode only), if data for either is available."
print_lines_basic "2" "-N" "Chip vendor:product ID for each nic."
print_lines_basic "2" "-R" "md-raid: Superblock (if present); algorythm, U data. Adds system info line (kernel support,read ahead, raid events). If present, adds unused device line. Resync line, shows progress bar."
print_lines_basic "2" "-S" "Display manager (dm) in desktop output, if in X (like kdm, gdm3, lightdm)."
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
if [[ $B_ALLOW_WEATHER == 'true' ]];then
fixed a small thing with -w/-W in help
2014-03-14 04:26:43 +00:00
print_lines_basic "2" "-w -W" "Humidity, barometric pressure."
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
fi
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "2" "-@ 11-14" "Automatically uploads debugger data tar.gz file to ftp.techpatterns.com. EG: $SCRIPT_NAME^-xx@14"
print_lines_basic "1" "-xxx" "Show extra, extra, extra data (only works with verbose or line output, not short form):"
print_lines_basic "2" "-S" "Panel/shell information in desktop output, if in X (like gnome-shell, cinnamon, mate-panel)."
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
if [[ $B_ALLOW_WEATHER == 'true' ]];then
fixed a small thing with -w/-W in help
2014-03-14 04:26:43 +00:00
print_lines_basic "2" "-w -W" "Location (uses -z/irc filter), weather observation time, wind chill, heat index, dew point (shows extra lines for data where relevant)."
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
fi
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "-z" "Security filters for IP/Mac addresses, location, user home directory name. Default on for irc clients."
print_lines_basic "1" "-Z" "Absolute override for output filters. Useful for debugging networking issues in irc for example."
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
print_screen_output " "
(Change Version Number) Updated help menu to better explain this new system, and split it into two parts: 1. output control 2. additional options This makes it easier to read and understand.
2008-11-10 23:08:07 +00:00
print_screen_output "Additional Options:"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "4" "-h --help" "This help menu."
print_lines_basic "4" "-H" "This help menu, plus developer options. Do not use dev options in normal operation!"
print_lines_basic "4" "--recommends" "Checks $SCRIPT_NAME application dependencies + recommends, and directories, then shows what package(s) you need to install to add support for that feature. "
(Change version) Added new distro maintainer flag: B_ALLOW_UPDATE='true' as default. If set to false, it will shut off the inxi script updating feature, and also turn off the display in -h of the -U option. This seems a lot easier than having to remove code each release, which would get fairly tiresome.
2008-11-13 19:27:48 +00:00
if [[ $B_ALLOW_UPDATE == 'true' ]];then
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "4" "-U" "Auto-update script. Will also install/update man page. Note: if you installed as root, you must be root to update, otherwise user is fine. Man page installs require root user mode."
(Change version) Added new distro maintainer flag: B_ALLOW_UPDATE='true' as default. If set to false, it will shut off the inxi script updating feature, and also turn off the display in -h of the -U option. This seems a lot easier than having to remove code each release, which would get fairly tiresome.
2008-11-13 19:27:48 +00:00
fi
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "4" "-V --version" "$SCRIPT_NAME version information. Prints information then exits."
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
print_screen_output " "
print_screen_output "Debugging Options:"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "-%" "Overrides defective or corrupted data."
print_lines_basic "1" "-@" "Triggers debugger output. Requires debugging level 1-14 (8-10 - logging of data). Less than 8 just triggers $SCRIPT_NAME debugger output on screen."
print_lines_basic "2" "1-7" "On screen debugger output"
print_lines_basic "2" "8" "Basic logging"
print_lines_basic "2" "9" "Full file/sys info logging"
print_lines_basic "2" "10" "Color logging."
print_lines_basic "1" "" "The following create a tar.gz file of system data, plus collecting the inxi output to file. To automatically upload debugger data tar.gz file to ftp.techpatterns.com: inxi^-xx@^<11-14>"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_lines_basic "1" "" "For alternate ftp upload locations: Example:^inxi^-!^ftp.yourserver.com/incoming^-xx@^14"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "2" "11" "With data file of xiin read of /sys."
print_lines_basic "2" "12" "With xorg conf and log data, xrandr, xprop, xdpyinfo, glxinfo etc."
print_lines_basic "2" "13" "With data from dev, disks, ${partition_string}s, etc., plus xiin data file."
print_lines_basic "2" "14" "Everything, full data collection."
a few more fine tunings of help
2014-03-14 04:55:41 +00:00
print_screen_output " "
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
print_screen_output "Advanced Options:"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "-! 31" "Turns off hostname in output. Useful if showing output from servers etc."
print_lines_basic "1" "-! 32" "Turns on hostname in output. Overrides global B_SHOW_HOST='false'"
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
(Change version) Added more useful -H option, now triggers advanced testing option display as well as regular help
2008-11-19 19:57:14 +00:00
if [[ $1 == 'full' ]];then
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
print_screen_output " "
(Change version) Added more useful -H option, now triggers advanced testing option display as well as regular help
2008-11-19 19:57:14 +00:00
print_screen_output "Developer and Testing Options (Advanced):"
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "-! 1" "Sets testing flag B_TESTING_1='true' to trigger testing condition 1."
print_lines_basic "1" "-! 2" "Sets testing flag B_TESTING_2='true' to trigger testing condition 2."
print_lines_basic "1" "-! 3" "Sets flags B_TESTING_1='true' and B_TESTING_2='true'."
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
if [[ $B_ALLOW_UPDATE == 'true' ]];then
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "-! 10" "Triggers an update from the primary dev download server instead of svn."
print_lines_basic "1" "-! 11" "Triggers an update from svn branch one - if present, of course."
print_lines_basic "1" "-! 12" "Triggers an update from svn branch two - if present, of course."
print_lines_basic "1" "-! 13" "Triggers an update from svn branch three - if present, of course."
print_lines_basic "1" "-! 14" "Triggers an update from svn branch four - if present, of course."
print_lines_basic "1" "-! 15" "Triggers an update from svn branch BSD - if present, of course."
print_lines_basic "1" "-! 16" "Triggers an update from svn branch GNUBSD - if present, of course."
print_lines_basic "1" "-! <http://......>" "Triggers an update from whatever server you list."
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_lines_basic "1" "-! <ftp.......>" "Changes debugging data ftp upload location to whatever you enter here. Only used together with -xx@^11-14, and must be used in front of that."
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "1" "" "Example: inxi^-!^ftp.yourserver.com/incoming^-xx@^14"
bug fix, this is the real one
2008-11-19 19:59:05 +00:00
fi
new features rollout in trunk, -c 94 - 99 triggers color selector which allows you to set in user] config file colors for: terminal in x, console out of x, gui irc, irc terminal in x, irc console out of x other tweaks too, simplified short inxi output, no more brackets, just a ~ or space as separator. New color schemes, about 30 total now, those will be modified over time to be the best set of colors for most users with most background types. Other cleanups, closer to 1.5.x release now.
2011-04-26 18:57:48 +00:00
print_screen_output " "
added help menu, -h and --help
2008-10-29 03:22:16 +00:00
}
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
# uses $TERM_COLUMNS to set width using $COLS_MAX as max width
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
# IMPORTANT: minimize use of subshells here or the output is too slow
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# IMPORTANT: each text chunk must be a continuous line, no line breaks. For anyone who uses a
# code editor that can't do visual (not hard coded) line wrapping, upgrade to one that can.
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
# args: $1 - 0 1 2 3 4 for indentation level; $2 -line starter, like -m; $3 - content of block.
print_lines_basic()
{
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
local line_width=$COLS_MAX
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
local print_string='' indent_inner='' indent_full='' indent_x=''
some small indentation fixes
2014-03-14 02:51:56 +00:00
local indent_working='' indent_working_full=''
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
local line_starter='' line_1_starter='' line_x_starter=''
# note: to create a padded string below
local fake_string=' ' temp_count='' line_count='' spacer=''
local indent_main=6 indent_x='' b_indent_x='true'
case $1 in
# for no options, start at left edge
0) indent_full=0
line_1_starter=''
line_x_starter=''
b_indent_x='false'
;;
1) indent_full=$indent_main
temp_count=${#2}
more adjustments
2014-03-14 04:58:19 +00:00
if [[ $temp_count -le $indent_full ]];then
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
indent_working=$indent_full
else
indent_working=$temp_count #$(( $temp_count + 1 ))
fi
line_1_starter="$( sed -e :a -e "s/^.\{1,$indent_working\}$/& /;ta" <<< $2 )"
;;
# first left pad 2 and 3, then right pad them
2) indent_full=$(( $indent_main + 6 ))
indent_inner=3
temp_count=${#2}
some small indentation fixes
2014-03-14 02:51:56 +00:00
if [[ $temp_count -le $indent_inner ]];then
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
indent_working=$indent_inner
some small indentation fixes
2014-03-14 02:51:56 +00:00
#indent_working_full=$indent_full
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
else
some small indentation fixes
2014-03-14 02:51:56 +00:00
indent_working=$(( $temp_count + 1 ))
#indent_working_full=$(( $indent_full - $indent_inner - 1 ))
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
fi
line_1_starter="$( sed -e :a -e "s/^.\{1,$indent_working\}$/& /;ta" <<< $2 )"
line_1_starter="$( sed -e :a -e "s/^.\{1,$indent_full\}$/ &/;ta" <<< "$line_1_starter" )"
;;
3) indent_full=$(( $indent_main + 8 ))
indent_inner=3
temp_count=${#2}
some small indentation fixes
2014-03-14 02:51:56 +00:00
if [[ $temp_count -le $indent_inner ]];then
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
indent_working=$indent_inner
else
some small indentation fixes
2014-03-14 02:51:56 +00:00
indent_working=$(( $temp_count + 1 ))
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
fi
line_1_starter="$( sed -e :a -e "s/^.\{1,$indent_working\}$/& /;ta" <<< $2 )"
line_1_starter="$( sed -e :a -e "s/^.\{1,$indent_full\}$/ &/;ta" <<< "$line_1_starter" )"
;;
# for long options
4) indent_full=$(( $indent_main + 8 ))
temp_count=${#2}
if [[ $temp_count -lt $indent_full ]];then
indent_working=$indent_full
else
indent_working=$temp_count #$(( $temp_count + 1 ))
fi
line_1_starter="$( sed -e :a -e "s/^.\{1,$indent_working\}$/& /;ta" <<< $2 )"
;;
esac
if [[ $b_indent_x == 'true' ]];then
indent_x=$(( $indent_full + 1 ))
line_x_starter="$(printf "%${indent_x}s" '')"
fi
line_count=$(( $line_width - $indent_full ))
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
# bash loop is slow, only run this if required
if [[ ${#3} -gt $line_count ]];then
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
for word in $3
do
temp_string="$print_string$spacer$word"
spacer=' '
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
if [[ ${#temp_string} -lt $line_count ]];then
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_string=$temp_string # lose any white space start/end
# echo -n $(( $line_width - $indent_full ))
else
if [[ -n $line_1_starter ]];then
line_starter="$line_1_starter"
line_1_starter=''
else
line_starter="$line_x_starter"
fi
# clean up forced connections, ie, stuff we don't want wrapping
bug fix, didn't strip out ^ properly
2014-03-14 02:39:27 +00:00
print_string=${print_string//\^/ }
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_screen_output "$line_starter$print_string"
print_string="$word$spacer" # needed to handle second word on new line
temp_string=''
spacer=''
fi
done
else
# echo no loop
print_string=$3
fi
# print anything left over
if [[ -n $print_string ]];then
if [[ -n $line_1_starter ]];then
line_starter="$line_1_starter"
line_1_starter=''
else
line_starter="$line_x_starter"
fi
bug fix, didn't strip out ^ properly
2014-03-14 02:39:27 +00:00
print_string=${print_string//\^/ }
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_screen_output "$line_starter$print_string"
fi
}
# print_lines_basic '1' '-m' 'let us teest this string and lots more and stuff and more stuff and x is wy and z is x and fred is dead and gus is alive an yes we have to go now'
# print_lines_basic '2' '7' 'and its substring this string and lots more and stuff and more stuff and x is wy and z is x and fred is dead and gus is alive an yes we have to go now'
# print_lines_basic '2' '12' 'and its sss substring'
# print_lines_basic '3' '12' 'and its sss substring this string and lots more and stuff and more stuff and x is wy and z is x and fred is dead and gus is alive an yes we have to go now'
# exit
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
## print out version information for -V/--version
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
print_version_info()
{
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
2013-01-23 22:05:47 +00:00
# if not in PATH could be either . or directory name, no slash starting
last fine tuning, now for specific irc support purposes, you can see what symbolic link started the real inxi
2013-01-23 22:41:07 +00:00
local script_path=$SCRIPT_PATH script_symbolic_start=''
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
2013-01-23 22:05:47 +00:00
if [[ $script_path == '.' ]];then
script_path=$( pwd )
elif [[ -z $( grep '^/' <<< "$script_path" ) ]];then
script_path="$( pwd )/$script_path"
fi
small glitch fix, very obscure case so checking --version path as symbolic link, use readlink if it is one.
2013-01-23 22:30:42 +00:00
# handle if it's a symbolic link, rare, but can happen with script directories in irc clients
# which would only matter if user starts inxi with -! 30 override in irc client
small bug fix with symbolic link path detection for --version
2013-01-23 22:35:10 +00:00
if [[ -L $script_path/$SCRIPT_NAME ]];then
last fine tuning, now for specific irc support purposes, you can see what symbolic link started the real inxi
2013-01-23 22:41:07 +00:00
script_symbolic_start=$script_path/$SCRIPT_NAME
small bug fix with symbolic link path detection for --version
2013-01-23 22:35:10 +00:00
script_path=$( readlink $script_path/$SCRIPT_NAME )
script_path=$( dirname $script_path )
small glitch fix, very obscure case so checking --version path as symbolic link, use readlink if it is one.
2013-01-23 22:30:42 +00:00
fi
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
local last_modified=$( parse_version_data 'date' )
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
2013-01-23 22:05:47 +00:00
local year_modified=$( gawk '{print $NF}' <<< "$last_modified" )
print_screen_output "$SCRIPT_NAME $SCRIPT_VERSION_NUMBER-$SCRIPT_PATCH_NUMBER ($last_modified)"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'false' ]];then
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
2013-01-23 22:05:47 +00:00
print_screen_output "Program Location: $script_path"
last fine tuning, now for specific irc support purposes, you can see what symbolic link started the real inxi
2013-01-23 22:41:07 +00:00
if [[ -n $script_symbolic_start ]];then
print_screen_output "Started via symbolic link: $script_symbolic_start"
fi
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "0" "" "Website:^http://inxi.goooglecode.com"
print_lines_basic "0" "" "IRC:^irc.oftc.net channel:^#smxi"
print_lines_basic "0" "" "Forums:^http://techpatterns.com/forums/forum-33.html"
print_screen_output " "
print_lines_basic "0" "" "$SCRIPT_NAME - the universal, portable, system information tool for console and irc."
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
2013-01-23 22:05:47 +00:00
print_screen_output " "
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_lines_basic "0" "" "This program started life as a fork of Infobash 3.02: Copyright^(C)^2005-2007^Michiel^de^Boer^a.k.a.^locsmif."
print_lines_basic "0" "" "Subsequent changes and modifications (after Infobash 3.02): Copyright^(C)^2008-${year_modified%%-*}^Harald^Hope,^Scott^Rogers,^aka^h2^&trash80."
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
2013-01-23 22:05:47 +00:00
print_screen_output " "
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
print_lines_basic "0" "" "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. (http://www.gnu.org/licenses/gpl.html)"
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
2013-01-23 22:05:47 +00:00
fi
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
}
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
########################################################################
#### MAIN FUNCTIONS
########################################################################
#### -------------------------------------------------------------------
#### initial startup stuff
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
#### -------------------------------------------------------------------
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
# Determine where inxi was run from, set IRC_CLIENT and IRC_CLIENT_VERSION
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
get_start_client()
Initial setup of repo
2008-10-28 00:40:43 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
local Irc_Client_Path='' irc_client_path_lower='' non_native_konvi='' i=''
local B_Non_Native_App='false' pppid='' App_Working_Name=''
New version, new tarball, new man page. Fixed an old bug where if you start inxi with an ssh command sometimes it will not show any client information, just the debugger PPID output. Now it will test as a final check to see if it can detect any parent to the process. Actually grandparent I believe. Seems to work, it's a fringe case but why not handle it? New -xx feature, for -I it will show, if inxi is not running in IRC client and if is running in X, and if the grandparent is not 'login', will show the application the shell is running in. Example: Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3 Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6 Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
2013-01-29 00:03:06 +00:00
local b_qt4_konvi='false' ps_parent=''
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'false' ]];then
Fixed some more weaknesses with the client detection function.
2008-11-09 08:57:27 +00:00
IRC_CLIENT='Shell'
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
unset IRC_CLIENT_VERSION
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
# elif [[ -n $PPID ]];then
Made all if conditionals use the same syntax, [[.....]];then, since we couldn't get rid of all the [[ stuff without getting errors, it should all be the same, so [[....]] it is. Also cleaned up some other cruft and reorganized code slightly.
2008-11-06 19:43:28 +00:00
elif [[ -n $PPID && -f /proc/$PPID/exe ]];then
1.5.2: new options: -z, triggers output filtering. This is default on for irc client output. -Z - absolute override, turns off all filtering. This is useful if you are helping someone on irc for example and need to see this data. Fixed a long term bug in the regex that filtered out home name from mount paths in partitions, was greedy, now it just filters out only the name and prints the rest of the full path, as it should. Added twm to desktop support list, that has no --version output so that won't show.
2011-05-24 20:47:22 +00:00
if [[ $B_OVERRIDE_FILTER != 'true' ]];then
B_OUTPUT_FILTER='true'
fi
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
Irc_Client_Path=$( readlink /proc/$PPID/exe )
# Irc_Client_Path=$( ps -p $PPID | gawk '!/[[:space:]]*PID/ {print $5}' )
# echo $( ps -p $PPID )
New version. Some BSD fixes, and a more important fix, added 'display controller' to graphics card detection, that's a new one on me. Dual card systems might use this. 00:02.0 Display controller: Intel Corporation 82865G Integrated Graphics Controller (rev 02) 01:00.0 VGA compatible controller: NVIDIA Corporation NV44A [GeForce 6200] (rev a1) Some more switches to bash native methods as well.
2014-03-18 02:26:26 +00:00
irc_client_path_lower=${Irc_Client_Path,,}
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
App_Working_Name=${irc_client_path_lower##*/}
A few major changes: in get client data, got rid of loose detections like *xchat* or *sh* and replaced them with tight, literals in the case list. This might trigger a few failures, but it's better to then handle those failures explicitly in my opinion than to depend on something as loose as *sh*, which will catch any app with sh ever made. Moved advanced hard disk data to be triggered now by -H, to avoid spamming irc. In the future, -x, extra data, will only be used for really silly little things like bogomips, ports, and so on, stuff that's short and basically just of interest to a few people.
2008-11-09 19:51:33 +00:00
# handles the xchat/sh/bash/dash cases, and the konversation/perl cases, where clients
# report themselves as perl or unknown shell. IE: when konversation starts inxi
# from inside itself, as a script, the parent is konversation/xchat, not perl/bash etc
(Change Version Number) Bug fix, major, had to add back in wildcard on perl detection and handling because it can report as not just perl but as perl5.10.0, a single string
2008-11-10 20:03:33 +00:00
# note: perl can report as: perl5.10.0, so it needs wildcard handling
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
case $App_Working_Name in
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
# bsd will never use this section
added python support for unknown irc clients and added konversation to that support.
2011-07-25 22:40:48 +00:00
bash|dash|sh|python*|perl*) # We want to know who wrapped it into the shell or perl.
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
pppid="$( ps -p $PPID -o ppid --no-headers | sed 's/[[:space:]]//g' )"
Fixed bug in bash method that fails in etch, old bash.
2008-11-09 08:26:06 +00:00
if [[ -n $pppid && -f /proc/$pppid/exe ]];then
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
Irc_Client_Path="$( readlink /proc/$pppid/exe )"
New version. Some BSD fixes, and a more important fix, added 'display controller' to graphics card detection, that's a new one on me. Dual card systems might use this. 00:02.0 Display controller: Intel Corporation 82865G Integrated Graphics Controller (rev 02) 01:00.0 VGA compatible controller: NVIDIA Corporation NV44A [GeForce 6200] (rev a1) Some more switches to bash native methods as well.
2014-03-18 02:26:26 +00:00
irc_client_path_lower=${Irc_Client_Path,,}
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
App_Working_Name=${irc_client_path_lower##*/}
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
B_Non_Native_App='true'
Initial setup of repo
2008-10-28 00:40:43 +00:00
fi
;;
esac
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
# sets version number if it can find it
get_irc_client_version
Initial setup of repo
2008-10-28 00:40:43 +00:00
else
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
## lets look to see if qt4_konvi is the parent. There is no direct way to tell, so lets infer it.
## because $PPID does not work with qt4_konvi, the above case does not work
1.5.2: new options: -z, triggers output filtering. This is default on for irc client output. -Z - absolute override, turns off all filtering. This is useful if you are helping someone on irc for example and need to see this data. Fixed a long term bug in the regex that filtered out home name from mount paths in partitions, was greedy, now it just filters out only the name and prints the rest of the full path, as it should. Added twm to desktop support list, that has no --version output so that won't show.
2011-05-24 20:47:22 +00:00
if [[ $B_OVERRIDE_FILTER != 'true' ]];then
B_OUTPUT_FILTER='true'
fi
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
b_qt4_konvi=$( is_this_qt4_konvi )
if [[ $b_qt4_konvi == 'true' ]];then
KONVI=3
IRC_CLIENT='Konversation'
IRC_CLIENT_VERSION=" $( konversation -v | gawk '
/Konversation:/ {
for ( i=2; i<=NF; i++ ) {
if (i == NF) {
print $i
}
else {
printf $i" "
}
}
exit
}' )"
else
New version, new tarball, new man page. Fixed an old bug where if you start inxi with an ssh command sometimes it will not show any client information, just the debugger PPID output. Now it will test as a final check to see if it can detect any parent to the process. Actually grandparent I believe. Seems to work, it's a fringe case but why not handle it? New -xx feature, for -I it will show, if inxi is not running in IRC client and if is running in X, and if the grandparent is not 'login', will show the application the shell is running in. Example: Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3 Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6 Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
2013-01-29 00:03:06 +00:00
# this should handle certain cases where it's ssh or some other startup tool
# that falls through all the other tests
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ $BSD_TYPE != 'bsd' ]];then
App_Working_Name=$(ps -p $PPID --no-headers 2>/dev/null | gawk '{print $NF}' )
else
# without --no-headers we need the second line
App_Working_Name=$(ps -p $PPID 2>/dev/null | gawk '/^[0-9]+/ {print $5}' )
fi
if [[ -n $App_Working_Name ]];then
Irc_Client_Path=$App_Working_Name
B_Non_Native_App='false'
get_irc_client_version
if [[ -z $IRC_CLIENT ]];then
IRC_CLIENT=$App_Working_Name
fi
New version, new tarball, new man page. Fixed an old bug where if you start inxi with an ssh command sometimes it will not show any client information, just the debugger PPID output. Now it will test as a final check to see if it can detect any parent to the process. Actually grandparent I believe. Seems to work, it's a fringe case but why not handle it? New -xx feature, for -I it will show, if inxi is not running in IRC client and if is running in X, and if the grandparent is not 'login', will show the application the shell is running in. Example: Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3 Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6 Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
2013-01-29 00:03:06 +00:00
else
IRC_CLIENT="PPID=\"$PPID\" - empty?"
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
unset IRC_CLIENT_VERSION
New version, new tarball, new man page. Fixed an old bug where if you start inxi with an ssh command sometimes it will not show any client information, just the debugger PPID output. Now it will test as a final check to see if it can detect any parent to the process. Actually grandparent I believe. Seems to work, it's a fringe case but why not handle it? New -xx feature, for -I it will show, if inxi is not running in IRC client and if is running in X, and if the grandparent is not 'login', will show the application the shell is running in. Example: Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3 Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6 Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
2013-01-29 00:03:06 +00:00
fi
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
fi
Initial setup of repo
2008-10-28 00:40:43 +00:00
fi
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "IRC_CLIENT: $IRC_CLIENT :: IRC_CLIENT_VERSION: $IRC_CLIENT_VERSION :: PPID: $PPID"
eval $LOGFE
Initial setup of repo
2008-10-28 00:40:43 +00:00
}
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
# note: all variables set in caller so no need to pass
get_irc_client_version()
{
local file_data=''
# replacing loose detection with tight detection, bugs will be handled with app names
# as they appear.
case $App_Working_Name in
# check for shell first
bash|dash|sh)
unset IRC_CLIENT_VERSION
IRC_CLIENT="Shell wrapper"
;;
# now start on irc clients, alphabetically
bitchx)
IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk '
/Version/ {
a=tolower($2)
gsub(/[()]|bitchx-/,"",a)
print a
exit
}
$2 == "version" {
a=tolower($3)
sub(/bitchx-/,"",a)
print a
exit
}' )"
B_CONSOLE_IRC='true'
IRC_CLIENT="BitchX"
;;
finch)
IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
print $2
}' )"
B_CONSOLE_IRC='true'
IRC_CLIENT="Finch"
;;
gaim)
IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
print $2
}' )"
IRC_CLIENT="Gaim"
;;
hexchat)
# the hexchat author decided to make --version/-v return a gtk dialogue box, lol...
# so we need to read the actual config file for hexchat. Note that older hexchats
# used xchat config file, so test first for default, then legacy. Because it's possible
# for this file to be use edited, doing some extra checks here.
if [[ -f ~/.config/hexchat/hexchat.conf ]];then
file_data="$( cat ~/.config/hexchat/hexchat.conf )"
elif [[ -f ~/.config/hexchat/xchat.conf ]];then
file_data="$( cat ~/.config/hexchat/xchat.conf )"
fi
if [[ -n $file_data ]];then
IRC_CLIENT_VERSION=$( gawk '
BEGIN {
IGNORECASE=1
FS="="
}
/^[[:space:]]*version/ {
# get rid of the space if present
gsub(/[[:space:]]*/, "", $2 )
print $2
exit # usually this is the first line, no point in continuing
}' <<< "$file_data" )
IRC_CLIENT_VERSION=" $IRC_CLIENT_VERSION"
else
IRC_CLIENT_VERSION=' N/A'
fi
IRC_CLIENT="HexChat"
;;
ircii)
IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
print $3
}' )"
B_CONSOLE_IRC='true'
IRC_CLIENT="ircII"
;;
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
irssi|irssi-text)
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
print $2
}' )"
B_CONSOLE_IRC='true'
IRC_CLIENT="Irssi"
;;
konversation) ## konvi < 1.2 (qt4)
# this is necessary to avoid the dcop errors from starting inxi as a /cmd started script
if [[ $B_Non_Native_App == 'true' ]];then ## true negative is confusing
KONVI=2
else # if native app
KONVI=1
fi
IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk '
/Konversation:/ {
for ( i=2; i<=NF; i++ ) {
if (i == NF) {
print $i
}
else {
printf $i" "
}
}
exit
}' )"
T=($IRC_CLIENT_VERSION)
if [[ ${T[0]} == *+* ]];then
# < Sho_> locsmif: The version numbers of SVN versions look like this:
# "<version number of last release>+ #<build number", i.e. "1.0+ #3177" ...
# for releases we remove the + and build number, i.e. "1.0" or soon "1.0.1"
IRC_CLIENT_VERSION=" CVS $IRC_CLIENT_VERSION"
T2="${T[0]/+/}"
else
IRC_CLIENT_VERSION=" ${T[0]}"
T2="${T[0]}"
fi
# Remove any dots except the first, and make sure there are no trailing zeroes,
T2=$( echo "$T2" | gawk '{
sub(/\./, " ")
gsub(/\./, "")
sub(/ /, ".")
printf("%g\n", $0)
}' )
# Since Konversation 1.0, the DCOP interface has changed a bit: dcop "$DCPORT" Konversation ..etc
# becomes : dcop "$DCPORT" default ... or dcop "$DCPORT" irc ..etc. So we check for versions smaller
# than 1 and change the DCOP parameter/object accordingly.
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $T2 -lt 1 ]];then
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
DCOPOBJ="Konversation"
fi
IRC_CLIENT="Konversation"
;;
kopete)
IRC_CLIENT_VERSION=" $( kopete -v | gawk '
/Kopete:/ {
print $2
exit
}' )"
IRC_CLIENT="Kopete"
;;
kvirc)
IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v 2>&1 | gawk '{
for ( i=2; i<=NF; i++) {
if ( i == NF ) {
print $i
}
else {
printf $i" "
}
}
exit
}' )"
IRC_CLIENT="KVIrc"
;;
pidgin)
IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
print $2
}' )"
IRC_CLIENT="Pidgin"
;;
quassel*)
# sample: quassel -v
# Qt: 4.5.0
# 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 ': ' '
BEGIN {
IGNORECASE=1
clientVersion=""
}
/Quassel IRC/ {
clientVersion = $2
}
END {
# this handles pre 0.4.1 cases with no -v
if ( clientVersion == "" ) {
clientVersion = "(pre v0.4.1)"
}
print clientVersion
}' )"
# now handle primary, client, and core. quasselcore doesn't actually
# handle scripts with exec, but it's here just to be complete
case $App_Working_Name in
quassel)
IRC_CLIENT="Quassel [M]"
;;
quasselclient)
IRC_CLIENT="Quassel"
;;
quasselcore)
IRC_CLIENT="Quassel (core)"
;;
esac
;;
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
gribble|limnoria|supybot)
IRC_CLIENT_VERSION=" $( get_program_version 'supybot' '^Supybot' '2' )"
if [[ -n $IRC_CLIENT_VERSION ]];then
if [[ -n ${IRC_CLIENT_VERSION/*gribble*/} || $App_Working_Name == 'gribble' ]];then
IRC_CLIENT="Gribble"
elif [[ -n ${IRC_CLIENT_VERSION/*limnoria*/} || $App_Working_Name == 'limnoria' ]];then
IRC_CLIENT="Limnoria"
else
IRC_CLIENT="Supybot"
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
fi
;;
weechat|weechat-curses)
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v ) "
B_CONSOLE_IRC='true'
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
IRC_CLIENT="WeeChat"
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
;;
xchat-gnome)
IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
print $2
}' )"
IRC_CLIENT="X-Chat-Gnome"
;;
xchat)
IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
print $2
}' )"
IRC_CLIENT="X-Chat"
;;
# then do some perl type searches, do this last since it's a wildcard search
perl*|ksirc|dsirc)
unset IRC_CLIENT_VERSION
# KSirc is one of the possibilities now. KSirc is a wrapper around dsirc, a perl client
get_cmdline $PPID
for (( i=0; i <= $CMDL_MAX; i++ ))
do
case ${A_CMDL[i]} in
*dsirc*)
IRC_CLIENT="KSirc"
# Dynamic runpath detection is too complex with KSirc, because KSirc is started from
# kdeinit. /proc/<pid of the grandparent of this process>/exe is a link to /usr/bin/kdeinit
# with one parameter which contains parameters separated by spaces(??), first param being KSirc.
# Then, KSirc runs dsirc as the perl irc script and wraps around it. When /exec is executed,
# dsirc is the program that runs inxi, therefore that is the parent process that we see.
# You can imagine how hosed I am if I try to make inxi find out dynamically with which path
# KSirc was run by browsing up the process tree in /proc. That alone is straightjacket material.
# (KSirc sucks anyway ;)
IRC_CLIENT_VERSION=" $( ksirc -v | gawk '
/KSirc:/ {
print $2
exit
}' )"
break
;;
esac
done
B_CONSOLE_IRC='true'
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
set_perl_python_client_data "$App_Working_Name"
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
;;
python*)
# B_CONSOLE_IRC='true' # are there even any python type console irc clients? check.
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
set_perl_python_client_data "$App_Working_Name"
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
;;
# then unset, set unknown data
*)
IRC_CLIENT="Unknown : ${Irc_Client_Path##*/}"
unset IRC_CLIENT_VERSION
;;
esac
if [[ $SHOW_IRC -lt 2 ]];then
unset IRC_CLIENT_VERSION
fi
}
# args: $1 - App_Working_Name
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
set_perl_python_client_data()
cleaned up konvi code, function for perl/python detection.
2011-07-25 22:43:47 +00:00
{
if [[ -z $IRC_CLIENT_VERSION ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
local version=''
cleaned up konvi code, function for perl/python detection.
2011-07-25 22:43:47 +00:00
# this is a hack to try to show konversation if inxi is running but started via /cmd
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
# OR via script shortcuts, both cases in fact now
if [[ $B_RUNNING_IN_DISPLAY == 'true' && -z ${Ps_aux_Data/*konversation*/} ]];then
cleaned up konvi code, function for perl/python detection.
2011-07-25 22:43:47 +00:00
IRC_CLIENT='Konversation'
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'konversation' '^konversation' '2' )
cleaned up konvi code, function for perl/python detection.
2011-07-25 22:43:47 +00:00
B_CONSOLE_IRC='false'
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
## NOTE: supybot only appears in ps aux using 'SHELL' command; the 'CALL' command
## gives the user system irc priority, and you don't see supybot listed, so use SHELL
elif [[ $B_RUNNING_IN_DISPLAY == 'false' && -z ${Ps_aux_Data/*supybot*/} ]];then
version=$( get_program_version 'supybot' '^Supybot' '2' )
if [[ -n $version ]];then
IRC_CLIENT_VERSION=" $version"
if [[ -z ${version/*gribble*/} ]];then
IRC_CLIENT='Gribble'
elif [[ -z ${version/*limnoria*/} ]];then
IRC_CLIENT='Limnoria'
else
IRC_CLIENT='Supybot'
fi
else
IRC_CLIENT='Supybot'
# currently all use the same actual app name, this will probably change.
fi
B_CONSOLE_IRC='true'
cleaned up konvi code, function for perl/python detection.
2011-07-25 22:43:47 +00:00
else
small bug fix for output of konvi perl/python handler
2011-07-25 22:56:21 +00:00
IRC_CLIENT="Unknown $1 client"
cleaned up konvi code, function for perl/python detection.
2011-07-25 22:43:47 +00:00
fi
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
if [[ -n $version ]];then
IRC_CLIENT_VERSION=" $version"
fi
cleaned up konvi code, function for perl/python detection.
2011-07-25 22:43:47 +00:00
fi
}
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
## try to infer the use of Konversation >= 1.2, which shows $PPID improperly
## no known method of finding Kovni >= 1.2 as parent process, so we look to see if it is running,
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
## and all other irc clients are not running. As of 2014-03-25 this isn't used in my cases
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
is_this_qt4_konvi()
{
local konvi_qt4_client='' konvi_dbus_exist='' konvi_pid='' konvi_home_dir=''
local konvi='' konvi_qt4_ver='' b_is_qt4=''
wrong branch, uploaded now to trunk the qdbus error squelch bug fix. Change version because output is error, now it's nulled.
2010-04-10 03:29:45 +00:00
Change version: Bug fix, added in globals B_DCOP / B_QDBUS for pretests of dcop/qdbus. Need to set both because some systems have both. Bug fix, added squashfs and unionfs to excluded fs types to clean up -p output for partition data
2010-06-11 03:44:19 +00:00
# fringe cases can throw error, always if untested app, use 2>/dev/null after testing if present
if [[ $B_QDBUS == 'true' ]];then
konvi_dbus_exist=$( qdbus 2>/dev/null | grep "org.kde.konversation" )
fi
trying a fix for konvi version for sabayon, they changed paths
2012-04-26 20:17:25 +00:00
# sabayon uses /usr/share/apps/konversation as path
if [[ -n $konvi_dbus_exist ]] && [[ -e /usr/share/kde4/apps/konversation || -e /usr/share/apps/konversation ]]; then
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
konvi_pid=$( ps -A | gawk 'BEGIN{IGNORECASE=1} /konversation/ { print $1 }' )
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
konvi_home_dir=$( readlink /proc/$konvi_pid/exe )
konvi=$( echo $konvi_home_dir | sed "s/\// /g" )
konvi=($konvi)
if [[ ${konvi[2]} == 'konversation' ]];then
konvi_qt4_ver=$( konversation -v | grep -i 'konversation' )
bug fix, long time bug, in konvi 4 detections
2011-05-22 02:56:01 +00:00
# note: we need to change this back to a single dot number, like 1.3, not 1.3.2
konvi_qt4_client=$( echo "$konvi_qt4_ver" | gawk '{ print $2 }' | cut -d '.' -f 1,2 )
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
if [[ $konvi_qt4_client > 1.1 ]]; then
b_is_qt4='true'
fi
fi
else
konvi_qt4="qt3"
b_is_qt4='false'
fi
new version, 1.5.11 Improved loaded/unloaded/failed output for gfx driver, now lists them by categor, ie: loaded: ati,radeon unloaded: fbdev This is because of the high count of loaded/unloaded drivers some systems show, especially for radeon/ati card types. Added logging for inxi in debugger data collector, and include now the log file, that should be of use.
2011-05-30 18:51:31 +00:00
log_function_data "b_is_qt4: $b_is_qt4"
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
echo $b_is_qt4
## for testing this module
#qdbus org.kde.konversation /irc say $1 $2 "getpid_dir: $konvi_qt4 qt4_konvi: $konvi_qt4_ver verNum: $konvi_qt4_ver_num pid: $konvi_pid ppid: $PPID konvi_home_dir: ${konvi[2]}"
}
updated trunk inxi
2009-05-28 20:26:29 +00:00
# This needs some cleanup and comments, not quite understanding what is happening, although generally output is known
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# Parse the null separated commandline under /proc/<pid passed in $1>/cmdline
# args: $1 - $PPID
get_cmdline()
put all core features into function containers as first step to break this into logical components
2008-10-28 03:42:28 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
local i=0 ppid=$1
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
if [[ ! -e /proc/$ppid/cmdline ]];then
echo 0
return
fi
##print_screen_output "Marker"
##print_screen_output "\$ppid='$ppid' -=- $(< /proc/$ppid/cmdline)"
unset A_CMDL
## note: need to figure this one out, and ideally clean it up and make it readable
(version change) Hopefully close to last cleanup and tweaks before releasing 1.0.0, but we'll see if more features or fixes need to be implemented.
2009-02-05 18:52:17 +00:00
while read -d $'\0' L && [[ $i -lt 32 ]]
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
do
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
A_CMDL[i++]="$L" ## note: make sure this is valid - What does L mean? ##
done < /proc/$ppid/cmdline
##print_screen_output "\$i='$i'"
if [[ $i -eq 0 ]];then
A_CMDL[0]=$(< /proc/$ppid/cmdline)
if [[ -n ${A_CMDL[0]} ]];then
i=1
Initial setup of repo
2008-10-28 00:40:43 +00:00
fi
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
fi
CMDL_MAX=$i
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "CMDL_MAX: $CMDL_MAX"
eval $LOGFE
put all core features into function containers as first step to break this into logical components
2008-10-28 03:42:28 +00:00
}
Initial setup of repo
2008-10-28 00:40:43 +00:00
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
#### -------------------------------------------------------------------
#### get data types
#### -------------------------------------------------------------------
(Change Version) Added alsa sound output as well if the /proc file is found
2008-11-14 00:42:13 +00:00
## create array of sound cards installed on system, and if found, use asound data as well
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
get_audio_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local i='' alsa_data='' audio_driver='' device_count='' a_temp=''
cleanup
2008-11-06 21:18:11 +00:00
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
IFS=$'\n'
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
# this first step handles the drivers for cases where the second step fails to find one
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
device_count=$( echo "$Lspci_v_Data" | grep -iEc '(multimedia audio controller|audio device)' )
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
if [[ $device_count -eq 1 ]] && [[ $B_ASOUND_DEVICE_FILE == 'true' ]];then
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
audio_driver=$( gawk -F ']: ' '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
}
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
# filtering out modems and usb devices like webcams, this might get a
# usb audio card as well, this will take some trial and error
fixed a bug in gawk that gave multiple drivers for audio card. Added webcam to filter list. And this new number includes the fixes to graphics driver output as well
2011-05-29 01:32:49 +00:00
$0 !~ /modem|usb|webcam/ {
(Change Version) Got a good rough working alsa driver going. This only works for one card, dual or more cards will simply not show the driver field, but everyone with just one card will be able to see their running driver. This is an ok compromise for now, but it wasn't super elegant.
2008-11-14 07:20:52 +00:00
driver=gensub( /^(.+)( - )(.+)$/, "\\1", 1, $2 )
gsub(/^ +| +$/,"",driver)
if ( driver != "" ){
print driver
}
fixed a bug in gawk that gave multiple drivers for audio card. Added webcam to filter list. And this new number includes the fixes to graphics driver output as well
2011-05-29 01:32:49 +00:00
}' $FILE_ASOUND_DEVICE )
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
log_function_data 'cat' "$FILE_ASOUND_DEVICE"
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
fi
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
Added towol fix for removing second line in alsa version output if compiled by second user
2008-11-14 20:26:15 +00:00
# this is to safeguard against line breaks from results > 1, which if inserted into following
# array will create a false array entry. This is a hack, not a permanent solution.
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
audio_driver=$( echo $audio_driver )
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
# now we'll build the main audio data, card name, driver, and port. If no driver is found,
# and if the first method above is not null, and one card is found, it will use that instead.
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
A_AUDIO_DATA=( $( echo "$Lspci_v_Data" | gawk -F ': ' -v audioDriver="$audio_driver" '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
/multimedia audio controller|audio device/ {
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
audioCard=gensub(/^[0-9a-f:\.]+ [^:]+: (.+)$/,"\\1","g",$0)
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
# The doublequotes are necessary because of the pipes in the variable.
gsub(/'"$BAN_LIST_NORMAL"'/, "", audioCard)
gsub(/,/, " ", audioCard)
gsub(/^ +| +$/, "", audioCard)
gsub(/ [ \t]+/, " ", audioCard)
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
aPciBusId[audioCard] = gensub(/(^[0-9a-f:\.]+) [^:]+: .+$/,"\\1","g",$0)
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
cards[audioCard]++
# loop until you get to the end of the data block
while (getline && !/^$/) {
(Change Version) fixed another small bug that made the print for busid use wrong data, forgot to clean , from original array data.
2010-02-05 23:04:02 +00:00
gsub( /,/, "", $0 )
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
if (/driver in use/) {
(Change Version) fixed another small bug that made the print for busid use wrong data, forgot to clean , from original array data.
2010-02-05 23:04:02 +00:00
drivers[audioCard] = drivers[audioCard] gensub( /(.*): (.*)/ ,"\\2", "g" ,$0 ) ""
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
}
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
else if (/kernel modules:/) {
(Change Version) fixed another small bug that made the print for busid use wrong data, forgot to clean , from original array data.
2010-02-05 23:04:02 +00:00
modules[audioCard] = modules[audioCard] gensub( /(.*): (.*)/ ,"\\2" ,"g" ,$0 ) ""
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
}
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
else if (/I\/O/) {
portsTemp = gensub(/\t*I\/O ports at (.*) \[.*\]/,"\\1","g",$0)
ports[audioCard] = ports[audioCard] portsTemp " "
}
(Change Version) Got a good rough working alsa driver going. This only works for one card, dual or more cards will simply not show the driver field, but everyone with just one card will be able to see their running driver. This is an ok compromise for now, but it wasn't super elegant.
2008-11-14 07:20:52 +00:00
}
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
}
END {
j=0
for (i in cards) {
useDrivers=""
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
useModules=""
usePorts=""
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
usePciBusId=""
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
if (cards[i]>1) {
a[j]=cards[i]"x "i
if (drivers[i] != "") {
useDrivers=drivers[i]
}
}
else {
a[j]=i
# little trick here to try to catch the driver if there is
# only one card and it was null, from the first test of asound/cards
if (drivers[i] != "") {
useDrivers=drivers[i]
}
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
else if ( audioDriver != "" ) {
useDrivers=audioDriver
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
}
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
}
if (ports[i] != "") {
usePorts = ports[i]
}
if (modules[i] != "" ) {
useModules = modules[i]
}
if ( aPciBusId[i] != "" ) {
usePciBusId = aPciBusId[i]
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
}
# create array primary item for master array
cleaned up small trailing whitespace issue with ports output, put the cleanup where it belongs, in the data get function
2010-02-05 22:42:31 +00:00
sub( / $/, "", usePorts ) # clean off trailing whitespace
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
print a[j] "," useDrivers "," usePorts "," useModules "," usePciBusId
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
j++
}
}') )
(Change Version) Added fail option for sound card test, also check /proc/asound/cards for something too
2008-11-11 05:58:15 +00:00
# in case of failure of first check do this instead
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
if [[ ${#A_AUDIO_DATA[@]} -eq 0 ]] && [[ $B_ASOUND_DEVICE_FILE == 'true' ]];then
(Change Version) Found bug with audio, /proc/asound/cards can have modem which creates via space a new array item. Added filters for /modem/ in those spots.
2008-11-14 09:22:25 +00:00
A_AUDIO_DATA=( $( gawk -F ']: ' '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
}
(Change Version) Found bug with audio, /proc/asound/cards can have modem which creates via space a new array item. Added filters for /modem/ in those spots.
2008-11-14 09:22:25 +00:00
$1 !~ /modem/ && $2 !~ /modem/ {
(Change Version) Added fail option for sound card test, also check /proc/asound/cards for something too
2008-11-11 05:58:15 +00:00
card=gensub( /^(.+)( - )(.+)$/, "\\3", 1, $2 )
(change version) This is as close as I can get to getting the alsa driver to show, but it only works if lspci for audio comes up blank, that way we can use /proc/asound/cards for all the data and extract the card and driver from that into an array. But I can't see any way to match the full output of lspci if present with the card data from /proc/asound/cards, because sometimes there is nothing in common between the two. Maybe someone else can solve this one...
2008-11-14 03:32:47 +00:00
driver=gensub( /^(.+)( - )(.+)$/, "\\1", 1, $2 )
if ( card != "" ){
print card","driver
}
fine tuning, get rid of extra grep in loop
2011-05-01 16:42:33 +00:00
}' $FILE_ASOUND_DEVICE ) )
(Change Version) Added fail option for sound card test, also check /proc/asound/cards for something too
2008-11-11 05:58:15 +00:00
fi
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
IFS="$ORIGINAL_IFS"
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
get_audio_usb_data
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
# handle cases where card detection fails, like in PS3, where lspci gives no output, or headless boxes..
Made all if conditionals use the same syntax, [[.....]];then, since we couldn't get rid of all the [[ stuff without getting errors, it should all be the same, so [[....]] it is. Also cleaned up some other cruft and reorganized code slightly.
2008-11-06 19:43:28 +00:00
if [[ ${#A_AUDIO_DATA[@]} -eq 0 ]];then
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
A_AUDIO_DATA[0]='Failed to Detect Sound Card!'
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_AUDIO_DATA[@]}
log_function_data "A_AUDIO_DATA: $a_temp"
Version number change: Added debugger option, data collector -@ 14, all data. Fixed long time logging bug, arrays were't writing out in quotes, have to extract out of quotes then send to logger. Added 802.11 to usb nic/wifi card detection strings. Updated help menu more to be more readable, and corrected some errors there too.
2011-06-06 19:58:47 +00:00
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
(Change Version) Got a good rough working alsa driver going. This only works for one card, dual or more cards will simply not show the driver field, but everyone with just one card will be able to see their running driver. This is an ok compromise for now, but it wasn't super elegant.
2008-11-14 07:20:52 +00:00
}
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
# alsa usb detection by damentz
get_audio_usb_data()
{
eval $LOGFS
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
local usb_proc_file='' array_count='' usb_data='' usb_id='' lsusb_data=''
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local a_temp=''
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
IFS=$'\n'
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p lsusb &>/dev/null;then
lsusb_data=$( lsusb 2>/dev/null )
patch for usb audio output tweak, patch for possible bug in usb audio function.
2011-06-23 01:25:35 +00:00
fi
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
log_function_data 'raw' "usb_data:\n$lsusb_data"
if [[ -n $lsusb_data ]];then
# for every sound card symlink in /proc/asound - display information about it
for usb_proc_file in /proc/asound/*
do
# If the file is a symlink, and contains an important usb exclusive file: continue
if [[ -L $usb_proc_file && -e $usb_proc_file/usbid ]]; then
# find the contents of usbid in lsusb and print everything after the 7th word on the
# corresponding line. Finally, strip out commas as they will change the driver :)
usb_id=$( cat $usb_proc_file/usbid )
usb_data=$( grep "$usb_id" <<< "$lsusb_data" )
if [[ -n $usb_data && -n $usb_id ]];then
usb_data=$( gawk '
BEGIN {
IGNORECASE=1
string=""
separator=""
}
{
gsub( /,/, " ", $0 )
gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
gsub(/ [ \t]+/, " ", $0)
for ( i=7; i<= NF; i++ ) {
string = string separator $i
separator = " "
}
same error for usb audio, fixed that too
2012-10-19 03:27:55 +00:00
if ( $2 != "" ){
bug fixes
2012-10-19 03:37:30 +00:00
sub(/:/,"", $4)
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
print string ",USB Audio,,," $2 "-" $4 "," $6
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
}
}' <<< "$usb_data" )
fi
# this method is interesting, it shouldn't work but it does
patch for usb audio output tweak, patch for possible bug in usb audio function.
2011-06-23 01:25:35 +00:00
#A_AUDIO_DATA=( "${A_AUDIO_DATA[@]}" "$usb_data,USB Audio,," )
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
# but until we learn why the above worked, I'm using this one, which is safer
if [[ -n $usb_data ]];then
array_count=${#A_AUDIO_DATA[@]}
A_AUDIO_DATA[$array_count]="$usb_data"
fi
fi
done
fi
IFS="$ORIGINAL_IFS"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_AUDIO_DATA[@]}
log_function_data "A_AUDIO_DATA: $a_temp"
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
eval $LOGFE
}
(Change Version) Got a good rough working alsa driver going. This only works for one card, dual or more cards will simply not show the driver field, but everyone with just one card will be able to see their running driver. This is an ok compromise for now, but it wasn't super elegant.
2008-11-14 07:20:52 +00:00
get_audio_alsa_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local alsa_data='' a_temp=''
(Change Version) Got a good rough working alsa driver going. This only works for one card, dual or more cards will simply not show the driver field, but everyone with just one card will be able to see their running driver. This is an ok compromise for now, but it wasn't super elegant.
2008-11-14 07:20:52 +00:00
# now we'll get the alsa data if the file exists
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
if [[ $B_ASOUND_VERSION_FILE == 'true' ]];then
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
IFS=","
A_ALSA_DATA=( $(
gawk '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
alsa=""
version=""
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
(Change Version) Fixed extra data issue on alsa output, now etch on old laptop is also showing sound card by the way. Removing (...date build...) string from alsa output if present, and removing trailing dot.
2008-11-14 01:49:58 +00:00
# some alsa strings have the build date in (...)
Added towol fix for removing second line in alsa version output if compiled by second user
2008-11-14 20:26:15 +00:00
# remove trailing . and remove possible second line if compiled by user
$0 !~ /compile/ {
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
gsub( /Driver | [(].*[)]|\.$/,"",$0 )
Added towol fix for removing second line in alsa version output if compiled by second user
2008-11-14 20:26:15 +00:00
gsub(/,/, " ", $0)
gsub(/^ +| +$/, "", $0)
gsub(/ [ \t]+/, " ", $0)
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
sub(/Advanced Linux Sound Architecture/, "ALSA", $0)
if ( $1 == "ALSA" ){
alsa=$1
Added towol fix for removing second line in alsa version output if compiled by second user
2008-11-14 20:26:15 +00:00
}
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
version=$NF
print alsa "," version
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' $FILE_ASOUND_VERSION ) )
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
IFS="$ORIGINAL_IFS"
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
log_function_data 'cat' "$FILE_ASOUND_VERSION"
(Change Version) Added alsa sound output as well if the /proc file is found
2008-11-14 00:42:13 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_ALSA_DATA[@]}
log_function_data "A_ALSA_DATA: $a_temp"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
}
more refactorings, trying to find out why readlink returns perl for konversation in inxi but not infobash
2008-10-28 23:39:01 +00:00
Updated get_cpu_core_count to return an array of data like other functions, this helps make methods more consistent over all get data functions
2008-11-04 22:08:46 +00:00
## create A_CPU_CORE_DATA, currently with two values: integer core count; core string text
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
## return value cpu core count string, this helps resolve the multi redundant lines of old style output
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
get_cpu_core_count()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
local cpu_physical_count='' cpu_core_count='' cpu_type='' cpu_alpha_count=''
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
if [[ $B_CPUINFO_FILE == 'true' ]]; then
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# load the A_CPU_TYPE_PCNT_CCNT core data array
get_cpu_ht_multicore_smp_data
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
## Because of the upcoming release of cpus with core counts over 6, a count of cores is given after Deca (10)
# count the number of processors given
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
cpu_physical_count=${A_CPU_TYPE_PCNT_CCNT[1]}
cpu_core_count=${A_CPU_TYPE_PCNT_CCNT[2]}
cpu_type=${A_CPU_TYPE_PCNT_CCNT[0]}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# match the numberic value to an alpha value
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
cpu_alpha_count=$( get_cpu_core_count_alpha "$cpu_core_count" )
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# create array, core count integer; core count string
(Change version) This fixes the multiple physical cpu missing data. I had to simplify the ht/smp part to make it work, also, from what I can tell, we only really need the terms: UP SMP HT SMP-HT which cover all possible scenarios from what I can tell http://en.wikipedia.org/wiki/Symmetric_multiprocessing says that it's all basically smp, single cpu, dual core, or multi cpu, single or multi core.
2009-02-03 22:20:11 +00:00
# A_CPU_CORE_DATA=( "$cpu_core_count" "$cpu_alpha_count Core$cpu_type" )
A_CPU_CORE_DATA=( "$cpu_physical_count" "$cpu_alpha_count" "$cpu_type" "$cpu_core_count" )
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
elif [[ -n $BSD_TYPE ]];then
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
local gawk_fs=': '
if [[ $BSD_VERSION == 'openbsd' ]];then
gawk_fs='='
fi
cpu_core_count=$( gawk -F "$gawk_fs" '
# note: on openbsd can also be hw.ncpufound so exit after first
/^hw.ncpu/ {
print $NF
exit
}' <<< "$Sysctl_a_Data" )
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
if [[ -n $( grep -E '^[0-9]+$' <<< "$cpu_core_count" ) ]];then
cpu_alpha_count=$( get_cpu_core_count_alpha "$cpu_core_count" )
if [[ $cpu_core_count -gt 1 ]];then
cpu_type='SMP'
fi
fi
cpu_physical_count=1
A_CPU_CORE_DATA=( "$cpu_physical_count" "$cpu_alpha_count" "$cpu_type" "$cpu_core_count" )
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_CPU_CORE_DATA[@]}
log_function_data "A_CPU_CORE_DATA: $a_temp"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
}
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
# args: $1 - integer core count
get_cpu_core_count_alpha()
{
eval $LOGFS
local cpu_alpha_count=''
case $1 in
1) cpu_alpha_count='Single';;
2) cpu_alpha_count='Dual';;
3) cpu_alpha_count='Triple';;
4) cpu_alpha_count='Quad';;
5) cpu_alpha_count='Penta';;
6) cpu_alpha_count='Hexa';;
7) cpu_alpha_count='Hepta';;
8) cpu_alpha_count='Octa';;
9) cpu_alpha_count='Ennea';;
10) cpu_alpha_count='Deca';;
*) cpu_alpha_count='Multi';;
esac
echo $cpu_alpha_count
eval $LOGFE
}
(change version) Some last code cleanup, comment cleanup, tweaked a few small things.
2008-11-11 23:36:25 +00:00
## main cpu data collector
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
get_cpu_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local i='' j='' cpu_array_nu='' a_cpu_working='' multi_cpu='' bits='' a_temp=''
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
local bsd_cpu_flags=''
Initial setup of repo
2008-10-28 00:40:43 +00:00
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
if [[ $B_CPUINFO_FILE == 'true' ]];then
(change version) a small issue fix, where cpu spike caused by inxi itself gives a bad cpu speed. Solution, put a 0.3 sleep time right before we get the cpu data. Less than 0.3 wasn't s reliable, not sure how much time the kernel needs to slow down cpus again. user can set config override of this time easily. Maybe one day inxi will be released with config files in /etc, then this stuff can be documented better in the file. I found the sleep largely unnoticeable in my tests.
2010-02-15 05:05:47 +00:00
# stop script for a bit to let cpu slow down before parsing cpu /proc file
sleep $CPU_SLEEP
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
IFS=$'\n'
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
A_CPU_DATA=( $(
gawk -F': ' '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
# need to prime nr for arm cpus, which do not have processor number output in some cases
nr = 0
count = 0
bArm = "false"
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
# TAKE STRONGER NOTE: \t+ does NOT always work, MUST be [ \t]+
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
# TAKE NOTE: \t+ will work for $FILE_CPUINFO, but SOME ARBITRARY FILE used for TESTING might contain SPACES!
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
# Therefore PATCH to use [ \t]+ when TESTING!
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
/^processor[ \t]+:/ {
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
gsub(/,/, " ", $NF)
gsub(/^ +| +$/, "", $NF)
if ( $NF ~ "^[0-9]+$" ) {
nr = $NF
}
else {
if ( $NF ~ "^ARM" ) {
bArm = "true"
}
count += 1
nr = count - 1
cpu[nr, "model"] = $NF
}
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
/^model name|^cpu\t+:/ {
gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF )
gsub(/'"$BAN_LIST_CPU"'/, "", $NF )
gsub(/,/, " ", $NF)
gsub(/^ +| +$/, "", $NF)
gsub(/ [ \t]+/, " ", $NF)
cpu[nr, "model"] = $NF
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
if ( $NF ~ "^ARM" ) {
bArm = "true"
}
Initial setup of repo
2008-10-28 00:40:43 +00:00
}
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
/^cpu MHz|^clock\t+:/ {
if (!min) {
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
min = $NF
}
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
else {
if ($NF < min) {
min = $NF
}
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
if ($NF > max) {
max = $NF
}
gsub(/MHZ/,"",$NF) ## clears out for cell cpu
gsub(/.00[0]+$/,".00",$NF) ## clears out excessive zeros
cpu[nr, "speed"] = $NF
Improved audio device detection with new string
2008-11-05 02:05:26 +00:00
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
/^cache size/ {
cpu[nr, "cache"] = $NF
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
/^flags|^features/ {
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
cpu[nr, "flags"] = $NF
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
# not all ARM cpus show ARM in model name
if ( $1 ~ /^features/ ) {
bArm = "true"
}
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
/^bogomips/ {
cpu[nr, "bogomips"] = $NF
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
/vendor_id/ {
gsub(/genuine|authentic/,"",$NF)
cpu[nr, "vendor"] = tolower( $NF )
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
}
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
END {
#if (!nr) { print ",,,"; exit } # <- should this be necessary or should bash handle that
for ( i = 0; i <= nr; i++ ) {
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
# note: assuming bogomips for arm at 1 x clock
# http://en.wikipedia.org/wiki/BogoMips ARM could change so watch this
New Version, new tarball. Added inxi.changelog to tarball as well. Continuing fixes for ARM cpus, it was noted that short form inxi failed to show cpu speed derived from bogomips. That's because of the old min/max output that short form used. Updated that section to now use N/A as flag, and if N/A for min/max speed, use the speed given from first cpu array index, the one derived from bogomips for ARM/razberry pi. Note that there is still no other ARM /proc/cpuinfo available to see if the razberry pi fixes work for all ARM cpus, but the fixes will stop hangs and endless loops at worst, and may also show some type of cpu speeds for ARM cpus that are not in razpi devices.
2013-01-22 20:47:00 +00:00
# maybe add: && bArm == "true" but I think most of the bogomips roughly equal cpu speed if not amd/intel
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
if ( cpu[i, "bogomips"] != "" && cpu[i, "speed"] == "" ) {
cpu[i, "speed"] = cpu[i, "bogomips"]
}
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
print cpu[i, "model"] "," cpu[i, "speed"] "," cpu[i, "cache"] "," cpu[i, "flags"] "," cpu[i, "bogomips"] "," cpu[nr, "vendor"] "," bArm
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
}
New version, fixed cpu core speed wrapping, improved -p and -P wrapping, though some lines will still be too long, but not as many.
2014-03-25 01:43:30 +00:00
New Version, new tarball. Added inxi.changelog to tarball as well. Continuing fixes for ARM cpus, it was noted that short form inxi failed to show cpu speed derived from bogomips. That's because of the old min/max output that short form used. Updated that section to now use N/A as flag, and if N/A for min/max speed, use the speed given from first cpu array index, the one derived from bogomips for ARM/razberry pi. Note that there is still no other ARM /proc/cpuinfo available to see if the razberry pi fixes work for all ARM cpus, but the fixes will stop hangs and endless loops at worst, and may also show some type of cpu speeds for ARM cpus that are not in razpi devices.
2013-01-22 20:47:00 +00:00
# this is / was used in inxi short output only, but when it is N/A, need to use the previous array
# value, from above, the actual speed that is, for short output, key 0.
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
if (!min) {
New Version, new tarball. Added inxi.changelog to tarball as well. Continuing fixes for ARM cpus, it was noted that short form inxi failed to show cpu speed derived from bogomips. That's because of the old min/max output that short form used. Updated that section to now use N/A as flag, and if N/A for min/max speed, use the speed given from first cpu array index, the one derived from bogomips for ARM/razberry pi. Note that there is still no other ARM /proc/cpuinfo available to see if the razberry pi fixes work for all ARM cpus, but the fixes will stop hangs and endless loops at worst, and may also show some type of cpu speeds for ARM cpus that are not in razpi devices.
2013-01-22 20:47:00 +00:00
print "N/A"
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
exit
}
else {
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
if (min != max) {
printf("Min:%s%s Max:%s%s\n", min, "Mhz", max, "Mhz")
}
else {
printf("%s %s\n", max, "Mhz")
}
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
}
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
}
' $FILE_CPUINFO ) )
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
IFS="$ORIGINAL_IFS"
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
log_function_data 'cat' "$FILE_CPUINFO"
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
elif [[ -n $BSD_TYPE ]];then
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
get_cpu_data_bsd
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
fi
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_CPU_DATA[@]}
log_function_data "A_CPU_DATA: $a_temp"
# echo ta: ${a_temp[@]}
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
# echo getMainCpu: ${[@]}
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
}
Initial setup of repo
2008-10-28 00:40:43 +00:00
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
get_cpu_data_bsd()
{
eval $LOGFS
local bsd_cpu_flags=$( get_cpu_flags_bsd )
local gawk_fs=': '
if [[ $BSD_VERSION == 'openbsd' ]];then
gawk_fs='='
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
# avoid setting this for systems where you have no read/execute permissions
# might be cases where the dmesg boot file was readable but sysctl perms failed
if [[ -n $Sysctl_a_Data || -n $bsd_cpu_flags ]];then
IFS=$'\n'
A_CPU_DATA=( $(
gawk -F "$gawk_fs" -v cpuFlags="$bsd_cpu_flags" '
BEGIN {
IGNORECASE=1
cpuModel=""
cpuClock=""
cpuCache=""
cpuBogomips=""
cpuVendor=""
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
}
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
/^hw.model/ {
gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF )
gsub(/'"$BAN_LIST_CPU"'/, "", $NF )
sub(//,"",$NF)
sub(/[a-z]+-core/, "", $NF )
gsub(/^ +| +$|\"/, "", $NF)
gsub(/ [ \t]+/, " ", $NF)
cpuModel=$NF
if ( cpuClock != "" ) {
exit
}
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
}
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
/^hw.(clock|cpuspeed)/ {
cpuClock=$NF
if ( cpuModel != "" ) {
exit
}
}
END {
print cpuModel "," cpuClock "," cpuCache "," cpuFlags "," cpuBogomips "," cpuVendor
print "N/A"
}' <<< "$Sysctl_a_Data" ) )
IFS="$ORIGINAL_IFS"
fi
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
eval $LOGFE
}
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
get_cpu_flags_bsd()
{
eval $LOGFS
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
local cpu_flags=''
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if [[ -n $Dmesg_Boot_Data ]];then
cpu_flags=$( gawk -F '=' '
BEGIN {
IGNORECASE=1
cpuFlags=""
}
/^CPU:/ {
while ( getline && !/memory/ ) {
if ( $1 ~ /Features/ ) {
# clean up odd stuff like <b23>
gsub(/<[a-z0-9]+>/,"", $2)
# all the flags are contained within < ... > on freebsd at least
gsub(/.*<|>.*/,"", $2)
gsub(/,/," ", $2)
cpuFlags = cpuFlags " " $2
}
}
cpuFlags=tolower(cpuFlags)
print cpuFlags
exit
}' <<< "$Dmesg_Boot_Data" )
fi
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
echo $cpu_flags
log_function_data "$cpu_flags"
eval $LOGFE
}
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
## this is for counting processors and finding HT types
get_cpu_ht_multicore_smp_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
small whitespace clean up
2009-01-06 22:20:06 +00:00
# in /proc/cpuinfo
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local a_temp=''
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
# note: known bug with xeon intel, they show a_core_id/physical_id as 0 for ht 4 core
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
if [[ $B_CPUINFO_FILE == 'true' ]]; then
(Change version) This fixes the multiple physical cpu missing data. I had to simplify the ht/smp part to make it work, also, from what I can tell, we only really need the terms: UP SMP HT SMP-HT which cover all possible scenarios from what I can tell http://en.wikipedia.org/wiki/Symmetric_multiprocessing says that it's all basically smp, single cpu, dual core, or multi cpu, single or multi core.
2009-02-03 22:20:11 +00:00
A_CPU_TYPE_PCNT_CCNT=( $(
gawk '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
FS=": "
IGNORECASE = 1
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
num_of_cores = 0
Updated and hopefully simplified the get_cpu<data>. We no longer care what the numbers are, all we do is count unique ids. Now we ignore the id identifier number, since the new i series from Intel either kills a logical processor or ships flawed quad cores as dual or dual HT, maybe even tri-core sometime. The new logic only cares about the number of cores, the number of physical processors, and the number of virtual processors.
2010-07-24 18:04:14 +00:00
num_of_processors = 0
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
num_of_physical_cpus = 0
bug fix, some intel cpus give core id as 0 for each core, thus creating a situation where inxi thinks it's a single core cpu, no matter if it's multicpu or multicore. Using the: cpu cores value to double check, as a fallback. This seems to work, ie, if cpu cores is listed as 1 but processor count * cpu count is > 1, then clearly the intel reporting bug is in play. Note that this is NOT an inxi bug, but is a bug in how some intel cpus create their cpuinfo data, but since intel is a major player, it's worth handling that issue.
2012-02-21 20:14:15 +00:00
cpu_core_count = 0
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
siblings = 0
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
# these 3 arrays cannot be declared because that sets the first element
# but leaving this here so that we avoid doing that in the future
# a_core_id = ""
# a_processor_id = ""
# a_physical_id = ""
cpu_type = "-"
# note: we need separate iterators because some cpuinfo data has only
# processor, no core id or phys id
proc_iter = 0
core_iter = "" # set from actual NF data
phys_iter = "" # set from actual NF data
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
# needed to handle arm cpu, no processor number cases
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
arm_count = 0
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
nr = 0
bArm = "false"
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
bXeon = "false"
}
# hack to handle xeons which can have buggy /proc/cpuinfo files
/^model name/ && ( $0 ~ /Xeon/ ) {
bXeon = "true"
}
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
# only do this once since sibling count does not change.
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
/^siblings/ && ( bXeon == "true" ) && ( siblings == 0 ) {
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
gsub(/[^0-9]/,"",$NF)
if ( $NF != "" ) {
siblings = $NF
}
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
Updated and hopefully simplified the get_cpu<data>. We no longer care what the numbers are, all we do is count unique ids. Now we ignore the id identifier number, since the new i series from Intel either kills a logical processor or ships flawed quad cores as dual or dual HT, maybe even tri-core sometime. The new logic only cares about the number of cores, the number of physical processors, and the number of virtual processors.
2010-07-24 18:04:14 +00:00
# array of logical processors, both HT and physical
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
/^processor/ {
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
gsub(/,/, " ", $NF)
gsub(/^ +| +$/, "", $NF)
if ( $NF ~ "^[0-9]+$" ) {
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
a_processor_id[proc_iter] = $NF
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
proc_iter++
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
}
else {
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
# note, for dual core, this can be off by one because the first
# line says: Processor : Arm.. but subsequent say: processor : 0 and so on as usual
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
if ( $NF ~ "^ARM" ) {
bArm = "true"
}
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
arm_count += 1
nr = arm_count - 1
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
# note: do not iterate because new ARM syntax puts cpu in processsor : 0 syntax
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
a_processor_id[proc_iter] = nr
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
}
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
# array of physical cpu ids, note, this will be unset for vm cpus in many cases
# because they have no physical cpu, so we cannot assume this will be here.
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
/^physical/ {
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
phys_iter = $NF
a_physical_id[phys_iter] = $NF
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
# array of core ids, again, here we may have HT, so we need to create an array of the
# actual core ids. As With physical, we cannot assume this will be here in a vm
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
/^core id/ {
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
core_iter = $NF
a_core_id[core_iter] = $NF
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
bug fix, some intel cpus give core id as 0 for each core, thus creating a situation where inxi thinks it's a single core cpu, no matter if it's multicpu or multicore. Using the: cpu cores value to double check, as a fallback. This seems to work, ie, if cpu cores is listed as 1 but processor count * cpu count is > 1, then clearly the intel reporting bug is in play. Note that this is NOT an inxi bug, but is a bug in how some intel cpus create their cpuinfo data, but since intel is a major player, it's worth handling that issue.
2012-02-21 20:14:15 +00:00
# this will be used to fix an intel glitch if needed, cause, intel
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
# sometimes reports core id as the same number for each core,
# so if cpu cores shows greater value than number of cores, use this.
bug fix, some intel cpus give core id as 0 for each core, thus creating a situation where inxi thinks it's a single core cpu, no matter if it's multicpu or multicore. Using the: cpu cores value to double check, as a fallback. This seems to work, ie, if cpu cores is listed as 1 but processor count * cpu count is > 1, then clearly the intel reporting bug is in play. Note that this is NOT an inxi bug, but is a bug in how some intel cpus create their cpuinfo data, but since intel is a major player, it's worth handling that issue.
2012-02-21 20:14:15 +00:00
/^cpu cores/ {
cpu_core_count = $NF
}
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
END {
Updated and hopefully simplified the get_cpu<data>. We no longer care what the numbers are, all we do is count unique ids. Now we ignore the id identifier number, since the new i series from Intel either kills a logical processor or ships flawed quad cores as dual or dual HT, maybe even tri-core sometime. The new logic only cares about the number of cores, the number of physical processors, and the number of virtual processors.
2010-07-24 18:04:14 +00:00
## Look thru the array and filter same numbers.
## only unique numbers required
## this is to get an accurate count
## we are only concerned with array length
i = 0
## count unique processors ##
bug fix, some intel cpus give core id as 0 for each core, thus creating a situation where inxi thinks it's a single core cpu, no matter if it's multicpu or multicore. Using the: cpu cores value to double check, as a fallback. This seems to work, ie, if cpu cores is listed as 1 but processor count * cpu count is > 1, then clearly the intel reporting bug is in play. Note that this is NOT an inxi bug, but is a bug in how some intel cpus create their cpuinfo data, but since intel is a major player, it's worth handling that issue.
2012-02-21 20:14:15 +00:00
# note, this fails for intel cpus at times
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
for ( i in a_processor_id ) {
Updated and hopefully simplified the get_cpu<data>. We no longer care what the numbers are, all we do is count unique ids. Now we ignore the id identifier number, since the new i series from Intel either kills a logical processor or ships flawed quad cores as dual or dual HT, maybe even tri-core sometime. The new logic only cares about the number of cores, the number of physical processors, and the number of virtual processors.
2010-07-24 18:04:14 +00:00
num_of_processors++
}
i = 0
## count unique physical cpus ##
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
for ( i in a_physical_id ) {
num_of_physical_cpus++
more indentation cleanup
2009-01-06 22:22:56 +00:00
}
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
i = 0
Updated and hopefully simplified the get_cpu<data>. We no longer care what the numbers are, all we do is count unique ids. Now we ignore the id identifier number, since the new i series from Intel either kills a logical processor or ships flawed quad cores as dual or dual HT, maybe even tri-core sometime. The new logic only cares about the number of cores, the number of physical processors, and the number of virtual processors.
2010-07-24 18:04:14 +00:00
## count unique cores ##
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
for ( i in a_core_id ) {
Updated and hopefully simplified the get_cpu<data>. We no longer care what the numbers are, all we do is count unique ids. Now we ignore the id identifier number, since the new i series from Intel either kills a logical processor or ships flawed quad cores as dual or dual HT, maybe even tri-core sometime. The new logic only cares about the number of cores, the number of physical processors, and the number of virtual processors.
2010-07-24 18:04:14 +00:00
num_of_cores++
(Change version) This fixes the multiple physical cpu missing data. I had to simplify the ht/smp part to make it work, also, from what I can tell, we only really need the terms: UP SMP HT SMP-HT which cover all possible scenarios from what I can tell http://en.wikipedia.org/wiki/Symmetric_multiprocessing says that it's all basically smp, single cpu, dual core, or multi cpu, single or multi core.
2009-02-03 22:20:11 +00:00
}
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
# xeon may show wrong core / physical id count, if it does, fix it. A xeon
# may show a repeated core id : 0 which gives a fake num_of_cores=1
if ( bXeon == "true" && num_of_cores == 1 && siblings > 1 ) {
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
num_of_cores = siblings/2
}
updated recommends for arch, xprop has changed to xorg-xprop
2012-03-26 20:32:27 +00:00
# final check, override the num of cores value if it clearly is wrong
# and use the raw core count and synthesize the total instead of real count
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
if ( ( num_of_cores == 0 ) && ( cpu_core_count * num_of_physical_cpus > 1 ) ) {
num_of_cores = cpu_core_count * num_of_physical_cpus
bug fix, some intel cpus give core id as 0 for each core, thus creating a situation where inxi thinks it's a single core cpu, no matter if it's multicpu or multicore. Using the: cpu cores value to double check, as a fallback. This seems to work, ie, if cpu cores is listed as 1 but processor count * cpu count is > 1, then clearly the intel reporting bug is in play. Note that this is NOT an inxi bug, but is a bug in how some intel cpus create their cpuinfo data, but since intel is a major player, it's worth handling that issue.
2012-02-21 20:14:15 +00:00
}
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
# last check, seeing some intel cpus and vms with intel cpus that do not show any
# core id data at all, or siblings.
if ( num_of_cores == 0 && num_of_processors > 0 ) {
num_of_cores = num_of_processors
}
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
# ARM/vm cpu fix, if no physical or core found, use count of 1 instead
if ( num_of_physical_cpus == 0 ) {
num_of_physical_cpus = 1
}
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
# print "NoCpu: " num_of_physical_cpus
# print "NoCores: " num_of_cores
# print "NoProc:" num_of_processors
# print "CpuCoreCount:" cpu_core_count
Updated and hopefully simplified the get_cpu<data>. We no longer care what the numbers are, all we do is count unique ids. Now we ignore the id identifier number, since the new i series from Intel either kills a logical processor or ships flawed quad cores as dual or dual HT, maybe even tri-core sometime. The new logic only cares about the number of cores, the number of physical processors, and the number of virtual processors.
2010-07-24 18:04:14 +00:00
####################################################################
# algorithm
# if > 1 processor && processor id (physical id) == core id then Hyperthreaded (HT)
# if > 1 processor && processor id (physical id) != core id then Multi-Core Processors (MCP)
# if > 1 processor && processor ids (physical id) > 1 then Multiple Processors (SMP)
# if = 1 processor then single core/processor Uni-Processor (UP)
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
if ( num_of_processors > 1 || ( bXeon == "true" && siblings > 0 ) ) {
Bugfix to cpu logic
2010-07-24 23:49:55 +00:00
# non-multicore HT
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
if ( num_of_processors == (num_of_cores * 2) ) {
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
cpu_type = cpu_type "HT-"
(Change version) This fixes the multiple physical cpu missing data. I had to simplify the ht/smp part to make it work, also, from what I can tell, we only really need the terms: UP SMP HT SMP-HT which cover all possible scenarios from what I can tell http://en.wikipedia.org/wiki/Symmetric_multiprocessing says that it's all basically smp, single cpu, dual core, or multi cpu, single or multi core.
2009-02-03 22:20:11 +00:00
}
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
else if ( bXeon == "true" && siblings > 1 ) {
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
cpu_type = cpu_type "HT-"
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
}
Bugfix to cpu logic
2010-07-24 23:49:55 +00:00
# non-HT multi-core or HT multi-core
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
if (( num_of_processors == num_of_cores) || ( num_of_physical_cpus < num_of_cores)) {
cpu_type = cpu_type "MCP-"
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
}
Bugfix to cpu logic
2010-07-24 23:49:55 +00:00
# >1 cpu sockets active
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
if ( num_of_physical_cpus > 1 ) {
cpu_type = cpu_type "SMP-"
more indentation cleanup
2009-01-06 22:22:56 +00:00
}
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
}
else {
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
cpu_type = cpu_type "UP-"
Updated and hopefully simplified the get_cpu<data>. We no longer care what the numbers are, all we do is count unique ids. Now we ignore the id identifier number, since the new i series from Intel either kills a logical processor or ships flawed quad cores as dual or dual HT, maybe even tri-core sometime. The new logic only cares about the number of cores, the number of physical processors, and the number of virtual processors.
2010-07-24 18:04:14 +00:00
}
New version, new tarball. Another stab at finally fixing the cpu / core count failures on fringe cases. This required fixing some core logic assumptions that are not currently correct, particularly on two cases, some xeon cpus fail to show core id for each core, showing 0 for all of them, second, vm cpus do not show physical ids at all for at least intel, nor do they show core id. While we can't get HT totally reliable, particularly for vm xeon, since inxi has no way to know in that case if a core is attached to a physical core or a virtual one, all of them being virtual in that case, but still inxi is now reporting the correct number of cores, or threads in vm xeons, and is not showing multicore cpus as single core, which was the main issue. This required redoing the counter logic for the cpu/core/physical arrays, now they are set independently, and can handle any of the others not being set, without creating an error or failure condition. Also added in last check for a certain intel case where core id is 0 but > 1 physical cores exist, that now also shows the correct cpu / core count. While this is tested on many data sets of proc cpuinfo, it's still possible there is a fringe case I have not seen that will trigger yet another unexpected behavior.
2013-06-20 00:29:19 +00:00
print cpu_type " " num_of_physical_cpus " " num_of_cores
more indentation cleanup
2009-01-06 22:22:56 +00:00
}
Bug fix, new version, new tarball. quick work around fix for razberrie pi, get cpu data hung on arm /proc/cpuinfo because it doesn't use the standard processor : [digit] format, but uses a string in the processor : field, which then hangs inxi which was expecting an integer. Corrected this with a work around, but it will require a lot more ARM /proc/cpuinfo samples before the support for ARM can be considered stable. For cpu speed, following wikipedia, used bogomips being equal to 1x cpu speed, to derive cpu speed. Better than nothing I guess, but will be wrong in other cases, particularly with dual core arm.
2013-01-22 00:14:48 +00:00
' $FILE_CPUINFO ) )
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_CPU_TYPE_PCNT_CCNT[@]}
log_function_data "A_CPU_TYPE_PCNT_CCNT: $a_temp"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
}
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
# Detect desktop environment in use, initial rough logic from: compiz-check
new feature, shows which desktop user is running, should work for gnome, kde 3.5, 4, 5, xfce 4, 5, fluxbox, lxde, openbox, blackbox, awesome, fvwm, fvwm-crystal, and we'll add more with user data
2011-05-18 23:00:03 +00:00
# http://forlong.blogage.de/entries/pages/Compiz-Check
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
# NOTE $XDG_CURRENT_DESKTOP envvar is not reliable, but it shows certain desktops better.
# most desktops are not using it as of 2014-01-13 (KDE, UNITY, LXDE. Not Gnome)
cleaned up, refactored irc tty version function
2011-05-25 23:11:31 +00:00
get_desktop_environment()
new feature, shows which desktop user is running, should work for gnome, kde 3.5, 4, 5, xfce 4, 5, fluxbox, lxde, openbox, blackbox, awesome, fvwm, fvwm-crystal, and we'll add more with user data
2011-05-18 23:00:03 +00:00
{
eval $LOGFS
# set the default, this function only runs in X, if null, don't print data out
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
local desktop_environment='' xprop_root=''
added kde version, and qt version, output
2011-05-19 05:03:14 +00:00
local version='' version_data='' toolkit=''
improved cinnamon desktop support for -S, apparently cinnamon has forked from gnome proper, and is now identifiable via xprop, so that is now moved to full desktop version handling. This requires bypassing the gnome test, which is a good thing, because the gnome test uses a deprecated method for gnome detection. Still works, but best to move from it no matter what. New tarball, new inxi version.
2012-09-16 17:59:06 +00:00
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
# works on 4, assume 5 will id the same, why not, no need to update in future
# KDE_SESSION_VERSION is the integer version of the desktop
if [[ $XDG_CURRENT_DESKTOP == 'KDE' || -n $KDE_SESSION_VERSION ]]; then
# note the command is actually like, kded4 --version, so we construct it
version_data=$( kded$KDE_SESSION_VERSION --version 2>/dev/null )
added kde version, and qt version, output
2011-05-19 05:03:14 +00:00
version=$( grep -si '^KDE Development Platform:' <<< "$version_data" | gawk '{print $4}' )
if [[ -z $version ]];then
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
version=$KDE_SESSION_VERSION
added kde version, and qt version, output
2011-05-19 05:03:14 +00:00
fi
changed toolkit to show only with -xS, that's not that important.
2011-05-20 05:24:57 +00:00
if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( grep -si '^Qt:' <<< "$version_data" | gawk '{print $2}' )
if [[ -n $toolkit ]];then
version="$version (Qt $toolkit)"
fi
added kde version, and qt version, output
2011-05-19 05:03:14 +00:00
fi
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment="KDE"
new feature, shows which desktop user is running, should work for gnome, kde 3.5, 4, 5, xfce 4, 5, fluxbox, lxde, openbox, blackbox, awesome, fvwm, fvwm-crystal, and we'll add more with user data
2011-05-18 23:00:03 +00:00
# KDE_FULL_SESSION property is only available since KDE 3.5.5.
# src: http://humanreadable.nfshost.com/files/startkde
elif [[ $KDE_FULL_SESSION == 'true' ]]; then
added kde version, and qt version, output
2011-05-19 05:03:14 +00:00
version_data=$( kded --version 2>/dev/null )
version=$( grep -si '^KDE:' <<< "$version_data" | gawk '{print $2}' )
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
# version=$( get_program_version 'kded' '^KDE:' '2' )
added kde version, and qt version, output
2011-05-19 05:03:14 +00:00
if [[ -z $version ]];then
version='3.5'
fi
changed toolkit to show only with -xS, that's not that important.
2011-05-20 05:24:57 +00:00
if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( grep -si '^Qt:' <<< "$version_data" | gawk '{print $2}' )
if [[ -n $toolkit ]];then
version="$version (Qt $toolkit)"
fi
added kde version, and qt version, output
2011-05-19 05:03:14 +00:00
fi
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment="KDE"
changed UNITY to Unity, no version change, but new tarball.
2014-01-14 18:48:16 +00:00
elif [[ $XDG_CURRENT_DESKTOP == 'Unity' ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'unity' '^unity' '2' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
# not certain cinn will always have version, so keep output right if not
if [[ -n $version ]];then
version="$version "
fi
if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( get_de_gtk_data )
if [[ -n $toolkit ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
version="$version(Gtk $toolkit)"
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
fi
fi
desktop_environment="Unity"
fi
# did we find it? If not, start the xprop tests
if [[ -z $desktop_environment ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p xprop &>/dev/null;then
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
xprop_root="$( xprop -root 2>/dev/null )"
fi
# note that cinnamon split from gnome, and and can now be id'ed via xprop,
# but it will still trigger the next gnome true case, so this needs to go before gnome test
# eventually this needs to be better organized so all the xprop tests are in the same
# section, but this is good enough for now.
if [[ -n $xprop_root && -n $( grep -is '^_MUFFIN' <<< "$xprop_root" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'cinnamon' '^cinnamon' '2' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
# not certain cinn will always have version, so keep output right if not
if [[ -n $version ]];then
version="$version "
fi
if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( get_de_gtk_data )
if [[ -n $toolkit ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
version="$version(Gtk $toolkit)"
tweaks
2011-05-21 23:20:21 +00:00
fi
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
fi
desktop_environment="Cinnamon"
elif [[ -n $xprop_root && -n $( grep -is '^_MARCO' <<< "$xprop_root" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'mate-about' '^MATE[[:space:]]DESKTOP' 'NF' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
# not certain cinn/mate will always have version, so keep output right if not
if [[ -n $version ]];then
version="$version "
fi
if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( get_de_gtk_data )
if [[ -n $toolkit ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
version="$version(Gtk $toolkit)"
more version info for other desktops
2011-05-19 05:52:08 +00:00
fi
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
fi
desktop_environment="MATE"
# note, GNOME_DESKTOP_SESSION_ID is deprecated so we'll see how that works out
# https://bugzilla.gnome.org/show_bug.cgi?id=542880
elif [[ -n $GNOME_DESKTOP_SESSION_ID ]]; then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p gnome-shell &>/dev/null;then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'gnome-shell' 'gnome' '3' )
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif type -p gnome-about &>/dev/null;then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'gnome-about' 'gnome' '3' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
fi
if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( get_de_gtk_data )
if [[ -n $toolkit ]];then
version="$version (Gtk $toolkit)"
tweaks
2011-05-21 23:20:21 +00:00
fi
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
fi
desktop_environment="Gnome"
fi
if [[ -z $desktop_environment ]];then
# now that the primary ones have been handled, next is to find the ones with unique
# xprop detections possible
if [[ -n $xprop_root ]];then
# String: "This is xfdesktop version 4.2.12"
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
# alternate: xfce4-about --version > xfce4-about 4.10.0 (Xfce 4.10)
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
if [[ -n $( grep -Eis '\"xfce4\"' <<< "$xprop_root" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' )
added in an xfce version fix for arch, user reports xfdesktop did not return a value, so we'll add a second test, xfce4-panel --version and see if that works
2014-01-13 23:55:02 +00:00
# arch linux reports null, so use alternate if null
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
if [[ -z $version ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'xfce4-panel' '^xfce4-panel' '2' )
added in an xfce version fix for arch, user reports xfdesktop did not return a value, so we'll add a second test, xfce4-panel --version and see if that works
2014-01-13 23:55:02 +00:00
if [[ -z $version ]];then
version='4'
fi
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
fi
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
if [[ $B_EXTRA_DATA == 'true' ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
toolkit=$( get_program_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
if [[ -n $toolkit ]];then
version="$version (Gtk $toolkit)"
fi
fi
desktop_environment="Xfce"
# when 5 is released, the string may need updating
elif [[ -n $( grep -is '\"xfce5\"' <<< "$xprop_root" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' )
added in an xfce version fix for arch, user reports xfdesktop did not return a value, so we'll add a second test, xfce4-panel --version and see if that works
2014-01-13 23:55:02 +00:00
# arch linux reports null, so use alternate if null
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
if [[ -z $version ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'xfce5-panel' '^xfce5-panel' '2' )
added in an xfce version fix for arch, user reports xfdesktop did not return a value, so we'll add a second test, xfce4-panel --version and see if that works
2014-01-13 23:55:02 +00:00
if [[ -z $version ]];then
version='5'
fi
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
fi
if [[ $B_EXTRA_DATA == 'true' ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
toolkit=$( get_program_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
if [[ -n $toolkit ]];then
version="$version (Gtk $toolkit)"
fi
fi
desktop_environment="Xfce"
elif [[ -n $( grep -is 'BLACKBOX_PID' <<< "$xprop_root" ) ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if [[ -n $( grep -is 'fluxbox' <<< "$Ps_aux_Data" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'fluxbox' '^fluxbox' '2' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='Fluxbox'
else
desktop_environment='Blackbox'
fi
elif [[ -n $( grep -is 'OPENBOX_PID' <<< "$xprop_root" ) ]];then
# note: openbox-lxde --version may be present, but returns openbox data
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'openbox' '^openbox' '2' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
if [[ $XDG_CURRENT_DESKTOP == 'LXDE' || \
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
-n $( grep -is 'lxde' <<< "$Ps_aux_Data" ) ]];then
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
if [[ -n $version ]];then
version="(Openbox $version)"
fi
desktop_environment='LXDE'
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif [[ -n $( grep -is 'razor-desktop' <<< "$Ps_aux_Data" ) ]];then
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
if [[ -n $version ]];then
version="(Openbox $version)"
fi
desktop_environment='Razor-QT'
else
desktop_environment='Openbox'
fi
elif [[ -n $( grep -is 'ICEWM' <<< "$xprop_root" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'icewm' '^icewm' '2' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='IceWM'
elif [[ -n $( grep -is 'ENLIGHTENMENT' <<< "$xprop_root" ) ]];then
# no -v or --version but version is in xprop -root
# ENLIGHTENMENT_VERSION(STRING) = "Enlightenment 0.16.999.49898"
version=$( grep -is 'ENLIGHTENMENT_VERSION' <<< "$xprop_root" | cut -d '"' -f 2 | gawk '{print $2}' )
desktop_environment='Enlightenment'
elif [[ -n $( grep -is '^I3_' <<< "$xprop_root" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'i3' '^i3' '3' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='i3'
elif [[ -n $( grep -is 'WINDOWMAKER' <<< "$xprop_root" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'wmaker' '^Window[[:space:]]*Maker' 'NF' )
bug fix
2011-05-19 06:58:31 +00:00
if [[ -n $version ]];then
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
version="$version "
bug fix
2011-05-19 06:58:31 +00:00
fi
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment="WindowMaker"
elif [[ -n $( grep -is '^_WM2' <<< "$xprop_root" ) ]];then
# note; there isn't actually a wm2 version available but error handling should cover it and return null
# maybe one day they will add it?
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'wm2' '^wm2' 'NF' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
# not certain will always have version, so keep output right if not
New inxi version, new tarball. Added support for razor-desktop in desktop id section. Tiny change, but there it is.
2012-05-27 19:12:55 +00:00
if [[ -n $version ]];then
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
version="$version "
New inxi version, new tarball. Added support for razor-desktop in desktop id section. Tiny change, but there it is.
2012-05-27 19:12:55 +00:00
fi
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment="WM2"
elif [[ -n $( grep -is 'herbstluftwm' <<< "$xprop_root" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'herbstluftwm' '^herbstluftwm' 'NF' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
if [[ -n $version ]];then
version="$version "
fi
desktop_environment="herbstluftwm"
New version, new tarball. Two new desktop/window managers added: spectrwm (similar to scrotwm) and herbstluftwm. Both tested and working, thanks anticap from Antix for doing the testing/issue report on this.
2013-07-01 22:15:51 +00:00
fi
more version info for other desktops
2011-05-19 05:52:08 +00:00
fi
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
# a few manual hacks for things that don't id with xprop, these are just good guesses
# note that gawk is going to exit after first occurance of search string, so no need for extra
if [[ -z $desktop_environment ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if [[ -n $( grep -is 'fvwm-crystal' <<< "$Ps_aux_Data" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'fvwm' '^fvwm' '2' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='FVWM-Crystal'
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif [[ -n $( grep -is 'fvwm' <<< "$Ps_aux_Data" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'fvwm' '^fvwm' '2' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='FVWM'
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif [[ -n $( grep -is 'pekwm' <<< "$Ps_aux_Data" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'pekwm' '^pekwm' '3' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='pekwm'
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif [[ -n $( grep -is 'awesome' <<< "$Ps_aux_Data" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'awesome' '^awesome' '2' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='Awesome'
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif [[ -n $( grep -is 'scrotwm' <<< "$Ps_aux_Data" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'scrotwm' '^welcome.*scrotwm' '4' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='Scrotwm' # no --version for this one
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif [[ -n $( grep -is 'spectrwm' <<< "$Ps_aux_Data" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'spectrwm' '^spectrwm.*welcome.*spectrwm' '5' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='Spectrwm' # no --version for this one
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif [[ -n $( grep -Eis '([[:space:]]|/)twm' <<< "$Ps_aux_Data" ) ]];then
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='Twm' # no --version for this one
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif [[ -n $( grep -Eis '([[:space:]]|/)dwm' <<< "$Ps_aux_Data" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'dwm' '^dwm' '1' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='dwm'
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif [[ -n $( grep -is 'wmii2' <<< "$Ps_aux_Data" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'wmii2' '^wmii2' '1' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='wmii2'
# note: in debian at least, wmii is actuall wmii3
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif [[ -n $( grep -is 'wmii' <<< "$Ps_aux_Data" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'wmii' '^wmii' '1' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='wmii'
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif [[ -n $( grep -Eis '([[:space:]]|/)jwm' <<< "$Ps_aux_Data" ) ]];then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
version=$( get_program_version 'jwm' '^jwm' '2' )
added some debugging data, real version update will be later today.
2014-01-13 20:05:31 +00:00
desktop_environment='JWM'
fi
more version info for other desktops
2011-05-19 05:52:08 +00:00
fi
new feature, shows which desktop user is running, should work for gnome, kde 3.5, 4, 5, xfce 4, 5, fluxbox, lxde, openbox, blackbox, awesome, fvwm, fvwm-crystal, and we'll add more with user data
2011-05-18 23:00:03 +00:00
fi
fi
fixed bugs
2011-05-21 22:46:13 +00:00
if [[ -n $version ]];then
version=" $version"
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
echo "$desktop_environment$version"
new feature, shows which desktop user is running, should work for gnome, kde 3.5, 4, 5, xfce 4, 5, fluxbox, lxde, openbox, blackbox, awesome, fvwm, fvwm-crystal, and we'll add more with user data
2011-05-18 23:00:03 +00:00
eval $LOGFE
}
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
# note: gawk doesn't support white spaces in search string, gave errors, so use [[:space:]] instead
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
# args: $1 - desktop/app command for --version; $2 - search string; $3 - gawk print number
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
get_program_version()
refactored desktop detections to avoid repeated code
2011-05-21 22:19:36 +00:00
{
trying a bug fix for scrotwm/dwm issue of sending --version/-v to stderr instead of stdout
2011-05-27 20:49:14 +00:00
local version_data='' version='' get_version='--version'
refactored desktop detections to avoid repeated code
2011-05-21 22:19:36 +00:00
Added MATE desktop support, same method as cinnamon, xprop shows the string _MARCO which is the renamed metacity window manager. Then mate-about -v gives the current mate version. New inxi, 1.8.17, new tarball.
2012-09-17 00:47:08 +00:00
# mate-about -v = MATE Desktop Environment 1.4.0
added trigger for --version/-v in get_de_version, sigh...
2011-05-26 20:01:07 +00:00
case $1 in
New version: desktop/dm added: WindowMaker, WM2. Also added in legacy wmii2 which may work. windowmaker and wm2 are detected via xprop -root, there is no version information for wm2 available so if you know how to detect that, let me know. New tarball as well, though no man page changes.
2013-01-09 19:33:08 +00:00
dwm|jwm|mate-about|wmii|wmii2)
added trigger for --version/-v in get_de_version, sigh...
2011-05-26 20:01:07 +00:00
get_version='-v'
;;
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
epoch)
get_version='version'
;;
added trigger for --version/-v in get_de_version, sigh...
2011-05-26 20:01:07 +00:00
esac
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
trying a bug fix for scrotwm/dwm issue of sending --version/-v to stderr instead of stdout
2011-05-27 20:49:14 +00:00
case $1 in
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
# note, some wm/apps send version info to stderr instead of stdout
New version, new tarball. Two new desktop/window managers added: spectrwm (similar to scrotwm) and herbstluftwm. Both tested and working, thanks anticap from Antix for doing the testing/issue report on this.
2013-07-01 22:15:51 +00:00
dwm|ksh|scrotwm|spectrwm)
had to redirect error output to 1
2011-05-27 20:55:15 +00:00
version_data="$( $1 $get_version 2>&1 )"
trying a bug fix for scrotwm/dwm issue of sending --version/-v to stderr instead of stdout
2011-05-27 20:49:14 +00:00
;;
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
csh)
version_data="$( tcsh $get_version 2>/dev/null )"
;;
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
# quick debian/buntu hack until I find a universal way to get version for these
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
dash)
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p dpkg &>/dev/null;then
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
version_data="$( dpkg -l $1 2>/dev/null )"
fi
;;
trying a bug fix for scrotwm/dwm issue of sending --version/-v to stderr instead of stdout
2011-05-27 20:49:14 +00:00
*)
version_data="$( $1 $get_version 2>/dev/null )"
;;
esac
added trigger for --version/-v in get_de_version, sigh...
2011-05-26 20:01:07 +00:00
added in a null case check
2011-05-27 20:49:47 +00:00
if [[ -n $version_data ]];then
version=$( gawk '
BEGIN {
IGNORECASE=1
}
/'$2'/ {
# sample: dwm-5.8.2, ©.. etc, why no space? who knows. Also get rid of v in number string
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
# xfce, and other, output has , in it, so dump all commas and parentheses
gsub(/(,|dwm-|wmii2-|wmii-|v|V|\(|\))/, "",$'$3')
added in a null case check
2011-05-27 20:49:47 +00:00
print $'$3'
exit # quit after first match prints
}' <<< "$version_data" )
fi
fixed bugs
2011-05-21 22:46:13 +00:00
echo $version
refactored desktop detections to avoid repeated code
2011-05-21 22:19:36 +00:00
}
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
added i3 wm to desktop detection, new tarball as well. Version bump since this is a real change.
2012-06-24 20:34:14 +00:00
get_desktop_extra_data()
{
eval $LOGFS
local de_data=$( ps -A | gawk '
BEGIN {
IGNORECASE=1
desktops=""
separator=""
}
improved cinnamon desktop support for -S, apparently cinnamon has forked from gnome proper, and is now identifiable via xprop, so that is now moved to full desktop version handling. This requires bypassing the gnome test, which is a good thing, because the gnome test uses a deprecated method for gnome detection. Still works, but best to move from it no matter what. New tarball, new inxi version.
2012-09-16 17:59:06 +00:00
/(gnome-shell|gnome-panel|kicker|lxpanel|mate-panel|plasma-desktop|xfce4-panel)$/ {
added i3 wm to desktop detection, new tarball as well. Version bump since this is a real change.
2012-06-24 20:34:14 +00:00
# only one entry per type, can be multiple
if ( desktops !~ $NF ) {
desktops = desktops separator $NF
separator = ","
}
}
END {
print desktops
}
' )
echo $de_data
eval $LOGFE
}
improved cinnamon desktop support for -S, apparently cinnamon has forked from gnome proper, and is now identifiable via xprop, so that is now moved to full desktop version handling. This requires bypassing the gnome test, which is a good thing, because the gnome test uses a deprecated method for gnome detection. Still works, but best to move from it no matter what. New tarball, new inxi version.
2012-09-16 17:59:06 +00:00
get_de_gtk_data()
{
eval $LOGFS
local toolkit=''
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
# this is a hack, and has to be changed with every toolkit version change, and only dev systems
# have this installed, but it's a cross distro command so let's test it first
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p pkg-config &>/dev/null;then
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
toolkit=$( pkg-config --modversion gtk+-4.0 2>/dev/null )
# note: opensuse gets null output here, we need the command to get version and output sample
if [[ -z $toolkit ]];then
toolkit=$( pkg-config --modversion gtk+-3.0 2>/dev/null )
fi
if [[ -z $toolkit ]];then
toolkit=$( pkg-config --modversion gtk+-2.0 2>/dev/null )
fi
Added MATE desktop support, same method as cinnamon, xprop shows the string _MARCO which is the renamed metacity window manager. Then mate-about -v gives the current mate version. New inxi, 1.8.17, new tarball.
2012-09-17 00:47:08 +00:00
fi
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
# now let's go to more specific version tests, this will never cover everything and that's fine.
improved cinnamon desktop support for -S, apparently cinnamon has forked from gnome proper, and is now identifiable via xprop, so that is now moved to full desktop version handling. This requires bypassing the gnome test, which is a good thing, because the gnome test uses a deprecated method for gnome detection. Still works, but best to move from it no matter what. New tarball, new inxi version.
2012-09-16 17:59:06 +00:00
if [[ -z $toolkit ]];then
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
# we'll try some known package managers next. dpkg will handle a lot of distros
# this is the most likely order as of: 2014-01-13. Not going to try to support all package managers
# too much work, just the very biggest ones.
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p dpkg &>/dev/null;then
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
toolkit=$( dpkg -s libgtk-3-0 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
if [[ -z $toolkit ]];then
toolkit=$( dpkg -s libgtk2.0-0 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
fi
# just guessing on gkt 4 package name
if [[ -z $toolkit ]];then
toolkit=$( dpkg -s libgtk-4-0 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif type -p pacman &>/dev/null;then
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
toolkit=$( pacman -Qi gtk3 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
if [[ -z $toolkit ]];then
toolkit=$( pacman -Qi gtk2 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
fi
fi
improved cinnamon desktop support for -S, apparently cinnamon has forked from gnome proper, and is now identifiable via xprop, so that is now moved to full desktop version handling. This requires bypassing the gnome test, which is a good thing, because the gnome test uses a deprecated method for gnome detection. Still works, but best to move from it no matter what. New tarball, new inxi version.
2012-09-16 17:59:06 +00:00
fi
echo $toolkit
eval $LOGFE
}
new -xx feature for -S, shows display manager running if in X. Supports currently the following: entrance gdm gdm3 kdm kdm-trinity lightdm lxdm mdm nodm slim wdm xdm there's been a relative flood of new display managers, and a few more are probably coming, so it's actually a somewhat useful thing to have this option. This is also going to close issue 30, which is not going to be further handled due to ratrace of trying to support various software packages running on the systems. Also updated man page for that -xx item.
2012-06-24 07:03:39 +00:00
# see which dm has started if any
get_display_manager()
{
by special Mint request, adding shell/panel type extra extra extra output to desktop, this is so easy to do I decided to just add an -xxx option, for extra extra extra data, no output if nothing detected. No big support issues, and Mint has used inxi by default for a while, so I think it's fine to add this for them.
2012-06-24 08:30:14 +00:00
eval $LOGFS
Added more dm, ldm, tint2. Added kicker to extra de info. Biggest change, totally reworked the man page, now it's much more complete and has a lot more information. Includes how to run in IRC clients, how to create konversation shortcut for /inxi type start. Ok, that's it, probably will refine the desktop extra information and maybe add a dm or two more. Also added in startx detection for when no dm was detected, thanks JavaAtom for that one.
2012-06-24 20:04:46 +00:00
# ldm - LTSP display manager
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local dm_id_list='entranced.pid gdm.pid gdm3.pid kdm.pid ldm.pid lightdm.pid lxdm.pid mdm.pid nodm.pid slim.lock tint2.pid wdm.pid xdm.pid'
small tweak added, if by some weird chance there's more than one dm, shows all of them, in comma separated list. This might help debug certain odd issues where a user might not know this is the case, or forgot, or something else weird.
2012-06-24 07:45:22 +00:00
local dm_id='' dm='' separator=''
Added more dm, ldm, tint2. Added kicker to extra de info. Biggest change, totally reworked the man page, now it's much more complete and has a lot more information. Includes how to run in IRC clients, how to create konversation shortcut for /inxi type start. Ok, that's it, probably will refine the desktop extra information and maybe add a dm or two more. Also added in startx detection for when no dm was detected, thanks JavaAtom for that one.
2012-06-24 20:04:46 +00:00
# note we don't need to filter grep if we do it this way
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
local x_is_running=$( grep '/usr.*/X' <<< "$Ps_aux_Data" | grep -iv '/Xprt' )
new -xx feature for -S, shows display manager running if in X. Supports currently the following: entrance gdm gdm3 kdm kdm-trinity lightdm lxdm mdm nodm slim wdm xdm there's been a relative flood of new display managers, and a few more are probably coming, so it's actually a somewhat useful thing to have this option. This is also going to close issue 30, which is not going to be further handled due to ratrace of trying to support various software packages running on the systems. Also updated man page for that -xx item.
2012-06-24 07:03:39 +00:00
for dm_id in $dm_id_list
do
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# note: ${dm_id%.*}/$dm_id will create a dir name out of the dm id, then test if pid is in that
if [[ -e /run/$dm_id || -e /run/${dm_id%.*}/$dm_id || -e /var/run/$dm_id ]];then
small tweak added, if by some weird chance there's more than one dm, shows all of them, in comma separated list. This might help debug certain odd issues where a user might not know this is the case, or forgot, or something else weird.
2012-06-24 07:45:22 +00:00
# just on the off chance that two dms are running, good info to have in that case, if possible
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
dm=$dm$separator${dm_id%.*}
small tweak added, if by some weird chance there's more than one dm, shows all of them, in comma separated list. This might help debug certain odd issues where a user might not know this is the case, or forgot, or something else weird.
2012-06-24 07:45:22 +00:00
separator=','
new -xx feature for -S, shows display manager running if in X. Supports currently the following: entrance gdm gdm3 kdm kdm-trinity lightdm lxdm mdm nodm slim wdm xdm there's been a relative flood of new display managers, and a few more are probably coming, so it's actually a somewhat useful thing to have this option. This is also going to close issue 30, which is not going to be further handled due to ratrace of trying to support various software packages running on the systems. Also updated man page for that -xx item.
2012-06-24 07:03:39 +00:00
fi
done
# might add this in, but the rate of new dm's makes it more likely it's an unknown dm, so
# we'll keep output to N/A
Added more dm, ldm, tint2. Added kicker to extra de info. Biggest change, totally reworked the man page, now it's much more complete and has a lot more information. Includes how to run in IRC clients, how to create konversation shortcut for /inxi type start. Ok, that's it, probably will refine the desktop extra information and maybe add a dm or two more. Also added in startx detection for when no dm was detected, thanks JavaAtom for that one.
2012-06-24 20:04:46 +00:00
if [[ -n $x_is_running && -z $dm ]];then
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
if [[ -n $( grep 'startx$' <<< "$Ps_aux_Data" ) ]];then
Added more dm, ldm, tint2. Added kicker to extra de info. Biggest change, totally reworked the man page, now it's much more complete and has a lot more information. Includes how to run in IRC clients, how to create konversation shortcut for /inxi type start. Ok, that's it, probably will refine the desktop extra information and maybe add a dm or two more. Also added in startx detection for when no dm was detected, thanks JavaAtom for that one.
2012-06-24 20:04:46 +00:00
dm='(startx)'
fi
fi
new -xx feature for -S, shows display manager running if in X. Supports currently the following: entrance gdm gdm3 kdm kdm-trinity lightdm lxdm mdm nodm slim wdm xdm there's been a relative flood of new display managers, and a few more are probably coming, so it's actually a somewhat useful thing to have this option. This is also going to close issue 30, which is not going to be further handled due to ratrace of trying to support various software packages running on the systems. Also updated man page for that -xx item.
2012-06-24 07:03:39 +00:00
echo $dm
log_function_data "display manager: $dm"
eval $LOGFE
}
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
# for more on distro id, please reference this python thread: http://bugs.python.org/issue1322
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
## return distro name/id if found
refactored and ordered get data functions
2008-10-30 05:04:11 +00:00
get_distro_data()
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local i='' j='' distro='' distro_file='' a_distro_glob='' a_temp=''
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
# may need modification if archbsd / debian can be id'ed with /etc files
if [[ -n $BSD_TYPE ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
distro=$( uname -sr )
echo "$distro"
log_function_data "distro: $distro"
eval $LOGFE
return 0
fi
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
# get the wild carded array of release/version /etc files if present
shopt -s nullglob
cd /etc
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
# note: always exceptions, so wild card after release/version: /etc/lsb-release-crunchbang
# wait to handle since crunchbang file is one of the few in the world that uses this method
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
a_distro_glob=(*[-_]{release,version})
cd "$OLDPWD"
shopt -u nullglob
added some logging, again, nothing worth a version bump, but a new tarball anyway.
2012-12-20 20:29:02 +00:00
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${a_distro_glob[@]}
log_function_data "A_GLX_DATA: $a_temp"
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
if [[ ${#a_distro_glob[@]} -eq 1 ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
distro_file="$a_distro_glob"
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
# use the file if it's in the known good lists
elif [[ ${#a_distro_glob[@]} -gt 1 ]];then
for i in $DISTROS_DERIVED $DISTROS_PRIMARY
do
# Only echo works with ${var[@]}, not print_screen_output() or script_debugger()
# This is a known bug, search for the word "strange" inside comments
# echo "i='$i' a_distro_glob[@]='${a_distro_glob[@]}'"
if [[ " ${a_distro_glob[@]} " == *" $i "* ]];then
reconfigured lsb lookup, h2's fix
2008-12-21 04:45:31 +00:00
# Now lets see if the distro file is in the known-good working-lsb-list
# if so, use lsb-release, if not, then just use the found file
# this is for only those distro's with self named release/version files
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
# because Mint does not use such, it must be done as below
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
## this if statement requires the spaces and * as it is, else it won't work
##
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ " $DISTROS_LSB_GOOD " == *" $i "* ]] && [[ $B_LSB_FILE == 'true' ]];then
reconfigured lsb lookup, h2's fix
2008-12-21 04:45:31 +00:00
distro_file='lsb-release'
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
elif [[ " $DISTROS_OS_RELEASE_GOOD " == *" $i "* ]] && [[ $B_OS_RELEASE_FILE == 'true' ]];then
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
distro_file='os-release'
reconfigured lsb lookup, h2's fix
2008-12-21 04:45:31 +00:00
else
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
distro_file="$i"
reconfigured lsb lookup, h2's fix
2008-12-21 04:45:31 +00:00
fi
lsb fix for distros with known good lsb files
2008-12-20 18:52:54 +00:00
break
fi
done
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
fi
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
log_function_data "distro_file: $distro_file"
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
# first test for the legacy antiX distro id file
if [[ -e /etc/antiX ]];then
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
distro="$( grep -Eoi 'antix.*\.iso' <<< $( remove_erroneous_chars '/etc/antiX' ) | sed 's/\.iso//' )"
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
# this handles case where only one release/version file was found, and it's lsb-release. This would
# never apply for ubuntu or debian, which will filter down to the following conditions. In general
# if there's a specific distro release file available, that's to be preferred, but this is a good backup.
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
elif [[ -n $distro_file && $B_LSB_FILE == 'true' && " $DISTROS_LSB_GOOD" == *" $distro_file "* ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
distro=$( get_distro_lsb_os_release_data 'lsb-file' )
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
elif [[ $distro_file == 'lsb-release' ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
distro=$( get_distro_lsb_os_release_data 'lsb-file' )
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
elif [[ $distro_file == 'os-release' ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
distro=$( get_distro_lsb_os_release_data 'os-release-file' )
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
# then if the distro id file was found and it's not in the exluded primary distro file list, read it
elif [[ -n $distro_file && -s /etc/$distro_file && " $DISTROS_EXCLUDE_LIST " != *" $distro_file "* ]];then
new version 1.8.22, fixed an old bug with opensuse/suse detection, now sets to default to os-release parser, and a corrected basic fallback for only /etc/SuSE-release present, presents only first line of that file. Also improved the /etc/os-release handler to include more data if the PRETTY_NAME field is blank. New tarball as well.
2012-11-17 22:32:32 +00:00
# new opensuse uses os-release, but older ones may have a similar syntax, so just use the first line
if [[ $distro_file == 'SuSE-release' ]];then
# leaving off extra data since all new suse have it, in os-release, this file has line breaks, like os-release
# but in case we want it, it's: CODENAME = Mantis | VERSION = 12.2
# for now, just take first occurance, which should be the first line, which does not use a variable type format
distro=$( grep -i -m 1 'suse' /etc/$distro_file )
else
distro=$( remove_erroneous_chars "/etc/$distro_file" )
fi
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
# otherwise try the default debian/ubuntu /etc/issue file
elif [[ -f /etc/issue ]];then
(No Version Change) Just some comment cleanups and small code cleanups.
2008-11-12 19:21:24 +00:00
# lsb gives more manageable and accurate output than issue, but mint should use issue for now
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
# some bashism, boolean must be in parenthesis to work correctly, ie [[ $(boolean) ]] not [[ $boolean ]]
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
if [[ $B_LSB_FILE == 'true' ]] && [[ -z $( grep -i 'mint' /etc/issue ) ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
distro=$( get_distro_lsb_os_release_data 'lsb-file' )
(Change Version) Trying out defaulting to /etc/lsb-release unless it's mint in /etc/issue, that gives more accurate readouts
2008-11-11 07:01:29 +00:00
else
distro=$( gawk '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
RS=""
}
{
(Change Version) Trying out defaulting to /etc/lsb-release unless it's mint in /etc/issue, that gives more accurate readouts
2008-11-11 07:01:29 +00:00
gsub(/\\[a-z]/, "")
gsub(/,/, " ")
gsub(/^ +| +$/, "")
gsub(/ [ \t]+/, " ")
print
}' /etc/issue )
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
# this handles an arch bug where /etc/arch-release is empty and /etc/issue is corrupted
# only older arch installs that have not been updated should have this fallback required, new ones use
# os-release
if [[ -n $( grep -i 'arch linux' <<< $distro ) ]];then
distro='Arch Linux'
fi
(Change Version) Trying out defaulting to /etc/lsb-release unless it's mint in /etc/issue, that gives more accurate readouts
2008-11-11 07:01:29 +00:00
fi
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
fi
new tarball, last patch, now globally strip out (x86_64/i686 type data too
2012-11-17 23:22:19 +00:00
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
if [[ ${#distro} -gt 80 ]] && [[ $B_HANDLE_CORRUPT_DATA != 'true' ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
distro="${RED}/etc/$distro_file corrupted, use -% to override${NORMAL}"
Initial setup of repo
2008-10-28 00:40:43 +00:00
fi
Made all if conditionals use the same syntax, [[.....]];then, since we couldn't get rid of all the [[ stuff without getting errors, it should all be the same, so [[....]] it is. Also cleaned up some other cruft and reorganized code slightly.
2008-11-06 19:43:28 +00:00
## note: would like to actually understand the method even if it's not used
# : ${distro:=Unknown distro o_O}
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
## test for /etc/lsb-release as a backup in case of failure, in cases where > one version/release file
## were found but the above resulted in null distro value
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
if [[ -z $distro ]] && [[ $B_LSB_FILE == 'true' ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
distro=$( get_distro_lsb_os_release_data 'lsb-file' )
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
fi
if [[ -z $distro ]] && [[ $B_OS_RELEASE_FILE == 'true' ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
distro=$( get_distro_lsb_os_release_data 'os-release-file' )
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
fi
added some comments to explain
2011-07-28 00:02:05 +00:00
# now some final null tries
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
if [[ -z $distro ]];then
added some comments to explain
2011-07-28 00:02:05 +00:00
# if the file was null but present, which can happen in some cases, then use the file name itself to
# set the distro value. Why say unknown if we have a pretty good idea, after all?
bug fix, forgot the null file case
2011-07-27 23:56:42 +00:00
if [[ -n $distro_file ]] && [[ " $DISTROS_DERIVED $DISTROS_PRIMARY " == *" $distro_file "* ]];then
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
distro=$( sed $SED_RX -e 's/[-_]//' -e 's/(release|version)//' <<< $distro_file | sed $SED_RX 's/^([a-z])/\u\1/' )
small patch for inxi unknown distro, this is a bug fix, so it's a version bump too.
2011-07-27 23:54:37 +00:00
fi
added some comments to explain
2011-07-28 00:02:05 +00:00
## finally, if all else has failed, give up
small patch for inxi unknown distro, this is a bug fix, so it's a version bump too.
2011-07-27 23:54:37 +00:00
if [[ -z $distro ]];then
changed Unknown distro to unknown, so the output will be: distro: unknown
2011-07-28 18:55:45 +00:00
distro='unknown'
small patch for inxi unknown distro, this is a bug fix, so it's a version bump too.
2011-07-27 23:54:37 +00:00
fi
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
fi
new tarball, last patch, now globally strip out (x86_64/i686 type data too
2012-11-17 23:22:19 +00:00
# final step cleanup of unwanted information
# opensuse has the x86 etc type string in names, not needed as redundant since -S already shows that
distro=$( gawk '
BEGIN {
IGNORECASE=1
}
{
ok, last fix, made pattern looser, now () around x86_64, i686, etc, are optional in search. Last, I think, tarball, and this is it.
2012-11-17 23:26:06 +00:00
sub(/ *\(*(x86_64|i486|i586|i686|686|586|486)\)*/, "", $0)
new tarball, last patch, now globally strip out (x86_64/i686 type data too
2012-11-17 23:22:19 +00:00
print $0
}' <<< $distro )
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
echo "$distro"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "distro: $distro"
eval $LOGFE
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
}
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
# args: $1 - lsb-file/lsb-app/os-release-file
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
get_distro_lsb_os_release_data()
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
local distro=''
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
case $1 in
lsb-file)
if [[ $B_LSB_FILE == 'true' ]];then
distro=$( gawk -F '=' '
BEGIN {
IGNORECASE=1
}
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
# clean out unwanted characters
{
more fine tuning of some gawk cleanup of os/lsb-release data, new tarball, no new version, this is more for future proofing at this point
2012-12-20 20:57:36 +00:00
gsub(/\\|\"|[:\47]/,"", $0 )
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2 )
gsub(/^[[:space:]]+|[[:space:]]+$/, "", $1 )
}
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
# note: adding the spacing directly to variable to make sure distro output is null if not found
/^DISTRIB_ID/ {
# this is needed because grep for "arch" is too loose to be safe
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
if ( $2 == "arch" ) {
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
distroId = "Arch Linux"
}
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
else if ( $2 != "n/a" ) {
distroId = $2 " "
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
}
}
/^DISTRIB_RELEASE/ {
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
if ( $2 != "n/a" ) {
distroRelease = $2 " "
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
}
}
/^DISTRIB_CODENAME/ {
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
if ( $2 != "n/a" ) {
distroCodename = $2 " "
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
}
}
# sometimes some distros cannot do their lsb-release files correctly, so here is
# one last chance to get it right.
/^DISTRIB_DESCRIPTION/ {
Tiny change, no new version, removed a stray 's' line 4306 that may have made certain distro ids get slightly corrupted, but this is so trivial just fixing it, new tarball.
2013-07-13 18:49:23 +00:00
if ( $2 != "n/a" ) {
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
distroDescription = $2
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
}
}
END {
fullString=""
if ( distroId == "" && distroRelease == "" && distroCodename == "" && distroDescription != "" ){
fullString = distroDescription
}
else {
fullString = distroId distroRelease distroCodename
}
print fullString
}
' $FILE_LSB_RELEASE )
log_function_data 'cat' "$FILE_LSB_RELEASE"
fi
;;
lsb-app)
# this is HORRIBLY slow, not using
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p lsb_release &>/dev/null;then
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
distro=$( echo "$( lsb_release -irc )" | gawk -F ':' '
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
BEGIN {
IGNORECASE=1
}
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
# clean out unwanted characters
{
more fine tuning of some gawk cleanup of os/lsb-release data, new tarball, no new version, this is more for future proofing at this point
2012-12-20 20:57:36 +00:00
gsub(/\\|\"|[:\47]/,"", $0 )
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2 )
gsub(/^[[:space:]]+|[[:space:]]+$/, "", $1 )
}
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
/^Distributor ID/ {
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
distroId = $2
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
}
/^Release/ {
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
distroRelease = $2
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
}
/^Codename/ {
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
distroCodename = $2
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
}
END {
print distroId " " distroRelease " (" distroCodename ")"
}' )
fi
;;
os-release-file)
if [[ $B_OS_RELEASE_FILE == 'true' ]];then
distro=$( gawk -F '=' '
BEGIN {
IGNORECASE=1
prettyName=""
regularName=""
new version 1.8.22, fixed an old bug with opensuse/suse detection, now sets to default to os-release parser, and a corrected basic fallback for only /etc/SuSE-release present, presents only first line of that file. Also improved the /etc/os-release handler to include more data if the PRETTY_NAME field is blank. New tarball as well.
2012-11-17 22:32:32 +00:00
versionName=""
versionId=""
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
distroName=""
}
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
# clean out unwanted characters
{
more fine tuning of some gawk cleanup of os/lsb-release data, new tarball, no new version, this is more for future proofing at this point
2012-12-20 20:57:36 +00:00
gsub(/\\|\"|[:\47]/,"", $0 )
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2 )
gsub(/^[[:space:]]+|[[:space:]]+$/, "", $1 )
}
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
# note: adding the spacing directly to variable to make sure distro output is null if not found
/^PRETTY_NAME/ {
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
if ( $2 != "n/a" ) {
prettyName = $2
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
}
}
/^NAME/ {
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
if ( $2 != "n/a" ) {
regularName = $2
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
}
bug fix, wait for 1.8.22 until verified
2012-11-17 22:49:30 +00:00
}
new version 1.8.22, fixed an old bug with opensuse/suse detection, now sets to default to os-release parser, and a corrected basic fallback for only /etc/SuSE-release present, presents only first line of that file. Also improved the /etc/os-release handler to include more data if the PRETTY_NAME field is blank. New tarball as well.
2012-11-17 22:32:32 +00:00
/^VERSION/ {
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
if ( $2 != "n/a" && $1 == "VERSION" ) {
versionName = $2
new version 1.8.22, fixed an old bug with opensuse/suse detection, now sets to default to os-release parser, and a corrected basic fallback for only /etc/SuSE-release present, presents only first line of that file. Also improved the /etc/os-release handler to include more data if the PRETTY_NAME field is blank. New tarball as well.
2012-11-17 22:32:32 +00:00
}
code cleanup on os-release/lsb-release, shouldn't make any difference for users, but there's a new tarball if you want to update the package.
2012-12-20 20:07:17 +00:00
else if ( $2 != "n/a" && $1 == "VERSION_ID" ) {
versionId = $2
new version 1.8.22, fixed an old bug with opensuse/suse detection, now sets to default to os-release parser, and a corrected basic fallback for only /etc/SuSE-release present, presents only first line of that file. Also improved the /etc/os-release handler to include more data if the PRETTY_NAME field is blank. New tarball as well.
2012-11-17 22:32:32 +00:00
}
}
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
END {
bug fix, wait for 1.8.22 until verified
2012-11-17 22:49:30 +00:00
if ( prettyName != "" ) {
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
distroName = prettyName
}
bug fix, wait for 1.8.22 until verified
2012-11-17 22:49:30 +00:00
else if ( regularName != "" ) {
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
distroName = regularName
bug fix, wait for 1.8.22 until verified
2012-11-17 22:49:30 +00:00
if ( versionName != "" ) {
new version 1.8.22, fixed an old bug with opensuse/suse detection, now sets to default to os-release parser, and a corrected basic fallback for only /etc/SuSE-release present, presents only first line of that file. Also improved the /etc/os-release handler to include more data if the PRETTY_NAME field is blank. New tarball as well.
2012-11-17 22:32:32 +00:00
distroName = distroName " " versionName
}
bug fix, wait for 1.8.22 until verified
2012-11-17 22:49:30 +00:00
else if ( versionId != "" ) {
new version 1.8.22, fixed an old bug with opensuse/suse detection, now sets to default to os-release parser, and a corrected basic fallback for only /etc/SuSE-release present, presents only first line of that file. Also improved the /etc/os-release handler to include more data if the PRETTY_NAME field is blank. New tarball as well.
2012-11-17 22:32:32 +00:00
distroName = distroName " " versionId
}
added in fallback mode /etc/os-release for all distros, and as preferred mode for Arch, which is I believe the only one that actually uses this at this point. Preferred is lsb-release, because that tends to be more accurate. Note, this may trigger arch derived distro errors, sigh...
2012-10-04 01:36:08 +00:00
}
print distroName
}
' $FILE_OS_RELEASE )
log_function_data 'cat' "$FILE_OS_RELEASE"
fi
;;
esac
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
echo $distro
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "distro: $distro"
eval $LOGFE
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
}
Initial setup of repo
2008-10-28 00:40:43 +00:00
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
get_dmidecode_data()
{
eval $LOGFS
local dmidecodePath=''
if [[ $B_DMIDECODE_SET != 'true' ]];then
dmidecodePath=$( type -p dmidecode 2>/dev/null )
if [[ -n $dmidecodePath ]];then
# note stripping out these lines: Handle 0x0016, DMI type 17, 27 bytes
# but NOT deleting them, in case the dmidecode data is missing empty lines which will be
# used to separate results. Then we remove the doubled empty lines to keep it clean and
# strip out all the stuff we don't want to see in the results.
DMIDECODE_DATA="$( $dmidecodePath 2>/dev/null \
| gawk -F ':' '
BEGIN {
IGNORECASE=1
cutExtraTab="false"
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
twoData=""
oneData=""
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
}
{
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
# no idea why, but freebsd gawk does not do this right
oneData=$1
twoData=$2
if ( twoData != "" ) {
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
twoHolder="true"
}
else {
twoHolder="false"
}
if ( $0 ~ /^\tDMI type/ ) {
sub(/^\tDMI type.*/, "", $0)
cutExtraTab="true"
}
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
gsub(/'"$BAN_LIST_NORMAL"'/, "", twoData)
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
gsub(/,/, " ", $0)
# clean out Handle line
sub(/^Handle.*/,"", $0)
sub(/^[[:space:]]*Inactive.*/,"",$0)
# yes, there is a typo in a user data set, unknow
# Base Board Version|Base Board Serial Number
# Chassis Manufacturer|Chassis Version|Chassis Serial Number
# System manufacturer|System Product Name|System Version
# To Be Filled By O.E.M.
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
# strip out starting white space so that the following stuff will clear properly
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
sub(/^[[:space:]]+/, "", twoData)
sub(/^Base Board .*|^Chassis .*|.*O\.E\.M\..*|.*OEM.*|^Not .*|^System .*|.*unknow.*|.*N\/A.*|none|^To be filled.*/, "", twoData)
gsub(/bios|acpi/, "", twoData)
sub(/http:\/\/www.abit.com.tw\//, "Abit", twoData)
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
# for double indented values replace with ~ so later can test for it, we are trusting that
# indentation will be tabbed in this case
# special case, dmidecode 2.2 has an extra tab and a DMI type line
if ( cutExtraTab == "true" ) {
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
sub(/^\t\t\t+/, "~", oneData)
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
}
else {
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
sub(/^\t\t+/, "~", oneData)
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
}
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
gsub(/^[[:space:]]+|[[:space:]]+$/, "", twoData)
gsub(/^[[:space:]]+|[[:space:]]+$/, "", oneData)
gsub(/ [ \t]+/, " ", twoData)
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
# reconstructing the line for processing so gawk can use -F : again
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if ( oneData != "" && twoHolder == "true" ) {
print oneData ":" twoData
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
}
else {
print $0
}
}' \
| sed '/^$/{
N
/^\n$/D
}' \
)"
fi
B_DMIDECODE_SET='true'
log_function_data "DMIDECODE_DATA: $DMIDECODE_DATA"
fi
eval $LOGFE
}
# get_dmidecode_data;echo "$DMIDECODE_DATA";exit
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
# BSD only
get_dmesg_boot_data()
{
eval $LOGFS
local dmsg_boot_data=''
if [[ $B_DMESG_BOOT_FILE == 'true' ]];then
# replace all indented items with ~ so we can id them easily while processing
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
# note that if user, may get error of read permissions
dmsg_boot_data="$( cat $FILE_DMESG_BOOT 2>/dev/null | sed $SED_RX 's/"//g' )"
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
fi
echo "$dmsg_boot_data"
# log_function_data "$dmsg_boot_data"
eval $LOGFE
}
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
get_gcc_kernel_version()
added to -S as -x option, kernel gcc version
2011-06-18 22:06:22 +00:00
{
Patch version upgrade fixed a bug with remote mounted partitions, created line length counter function that cleans off color code characters to allow for accurate line counts for line breaks.
2011-06-19 05:53:18 +00:00
# note that we use gawk to get the last part because beta, alpha, git versions can be non-numeric
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
local gccVersion=''
if [[ -e /proc/version ]];then
gccVersion=$( grep -Eio 'gcc[[:space:]]*version[[:space:]]*([^ \t]*)' /proc/version 2>/dev/null | gawk '{print $3}' )
fi
added to -S as -x option, kernel gcc version
2011-06-18 22:06:22 +00:00
echo $gccVersion
}
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
get_gcc_system_version()
{
fine tunings to avoid some possible errors
2011-07-06 03:54:25 +00:00
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local separator='' gcc_installed='' gcc_list='' gcc_others='' a_temp=''
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
local gcc_version=$(
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
gcc --version 2>/dev/null | sed $SED_RX 's/\([^\)]*\)//g' | gawk '
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
BEGIN {
IGNORECASE=1
}
/^gcc/ {
print $2
exit
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' )
fine tunings to avoid some possible errors
2011-07-06 03:54:25 +00:00
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
# can't use xargs -L basename because not all systems support thats
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
fine tunings to avoid some possible errors
2011-07-06 03:54:25 +00:00
gcc_others=$( ls /usr/bin/gcc-* 2>/dev/null )
if [[ -n $gcc_others ]];then
for item in $gcc_others
do
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
item=${item##*/}
gcc_installed=$( gawk -F '-' '
fine tunings to avoid some possible errors
2011-07-06 03:54:25 +00:00
$2 ~ /^[0-9\.]+$/ {
print $2
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
}' <<< $item )
fine tunings to avoid some possible errors
2011-07-06 03:54:25 +00:00
if [[ -n $gcc_installed && -z $( grep "^$gcc_installed" <<< $gcc_version ) ]];then
gcc_list=$gcc_list$separator$gcc_installed
separator=','
fi
done
fi
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
fi
if [[ -n $gcc_version ]];then
A_GCC_VERSIONS=( "$gcc_version" $gcc_list )
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_GCC_VERSIONS[@]}
log_function_data "A_GCC_VERSIONS: $a_temp"
fine tunings to avoid some possible errors
2011-07-06 03:54:25 +00:00
eval $LOGFE
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
}
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
get_gpu_temp_data()
{
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
local gpu_temp='' gpu_fan='' screens='' screen_nu='' gpu_temp_looper=''
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
# we'll try for nvidia/ati, then add if more are shown
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p nvidia-settings &>/dev/null;then
# first get the number of screens. This only work if you are in X
if [[ $B_RUNNING_IN_DISPLAY == 'true' ]];then
screens=$( nvidia-settings -q screens | gawk '
/:[0-9]\.[0-9]/ {
screens=screens gensub(/(.*)(:[0-9]\.[0-9])(.*)/, "\\2", "1", $0) " "
}
END {
print screens
}
' )
else
# do a guess, this will work for most users, it's better than nothing for out of X
screens=':0.0'
fi
(change version nu) Added nvidia only gpu temp output for multiple gpus. If > 1 gpu screen is detected, it will output the gpu temp data for each discovered screen. For 1 gpu with nvidia, it will show screen nu if you use the -x option, or with -F This is an nvidia proprietary driver feature only.
2009-11-16 19:03:29 +00:00
# now we'll get the gpu temp for each screen discovered. The print out function
# will handle removing screen data for single gpu systems
for screen_nu in $screens
do
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
gpu_temp_looper=$( nvidia-settings -c $screen_nu -q GPUCoreTemp 2>/dev/null | gawk -F ': ' '
(change version nu) Added nvidia only gpu temp output for multiple gpus. If > 1 gpu screen is detected, it will output the gpu temp data for each discovered screen. For 1 gpu with nvidia, it will show screen nu if you use the -x option, or with -F This is an nvidia proprietary driver feature only.
2009-11-16 19:03:29 +00:00
BEGIN {
IGNORECASE=1
gpuTemp=""
gpuTempWorking=""
}
/Attribute (.*)[0-9]+\.$/ {
gsub(/\./, "", $2)
if ( $2 ~ /^[0-9]+$/ ) {
gpuTemp=gpuTemp $2 "C "
}
}
END {
print gpuTemp
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' )
(change version nu) Added nvidia only gpu temp output for multiple gpus. If > 1 gpu screen is detected, it will output the gpu temp data for each discovered screen. For 1 gpu with nvidia, it will show screen nu if you use the -x option, or with -F This is an nvidia proprietary driver feature only.
2009-11-16 19:03:29 +00:00
screen_nu=$( cut -d ':' -f 2 <<< $screen_nu )
cleanup
2009-11-16 19:26:07 +00:00
gpu_temp="$gpu_temp$screen_nu:$gpu_temp_looper "
(change version nu) Added nvidia only gpu temp output for multiple gpus. If > 1 gpu screen is detected, it will output the gpu temp data for each discovered screen. For 1 gpu with nvidia, it will show screen nu if you use the -x option, or with -F This is an nvidia proprietary driver feature only.
2009-11-16 19:03:29 +00:00
done
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif type -p aticonfig &>/dev/null;then
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
# gpu_temp=$( aticonfig --adapter=0 --od-gettemperature | gawk -F ': ' '
bug fix to ati detection gpu temp
2009-08-03 08:14:43 +00:00
gpu_temp=$( aticonfig --adapter=all --od-gettemperature | gawk -F ': ' '
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
BEGIN {
IGNORECASE=1
bug fix, handled case of multiple gpus and temps
2009-08-03 08:21:11 +00:00
gpuTemp=""
gpuTempWorking=""
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
}
/Sensor (.*)[0-9\.]+ / {
bug fix, handled case of multiple gpus and temps
2009-08-03 08:21:11 +00:00
gpuTempWorking=gensub(/(.*) ([0-9\.]+) (.*)/, "\\2", "1", $2)
if ( gpuTempWorking ~ /^[0-9\.]+$/ ) {
gpuTemp=gpuTemp gpuTempWorking "C "
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
}
bug fix, handled case of multiple gpus and temps
2009-08-03 08:21:11 +00:00
}
END {
print gpuTemp
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' )
adding support, initial, for free xorg gpu temp output, first only for the newer radeons
2011-06-24 21:59:57 +00:00
# this handles some newer cases of free driver temp readouts, will require modifications as
# more user data appears.
elif [[ -n $Sensors_Data ]];then
gpu_temp=$(
gawk '
BEGIN {
IGNORECASE=1
gpuTemp=""
separator=""
}
updated sensors to handle gpu data more cleanly.
2011-06-25 17:08:57 +00:00
/^('"$SENSORS_GPU_SEARCH"')-pci/ {
adding support, initial, for free xorg gpu temp output, first only for the newer radeons
2011-06-24 21:59:57 +00:00
while ( getline && !/^$/ ) {
if ( /^temp/ ) {
sub(/^[[:alnum:]]*.*:/, "", $0 ) # clear out everything to the :
gsub(/[\+ \t°]/, "", $1) # ° is a special case, like a space for gawk
gpuTemp=gpuTemp separator $1
separator=","
}
}
}
END {
print gpuTemp
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' <<< "$Sensors_Data" )
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
fi
if [[ -n $gpu_temp ]];then
echo $gpu_temp
fi
}
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
## for possible future data, not currently used
get_graphics_agp_data()
{
eval $LOGFS
local agp_module=''
if [[ $B_MODULES_FILE == 'true' ]];then
## not used currently
agp_module=$( gawk '
/agp/ && !/agpgart/ && $3 > 0 {
print(gensub(/(.*)_agp.*/,"\\1","g",$1))
}' $FILE_MODULES )
log_function_data 'cat' "$FILE_MODULES"
fi
log_function_data "agp_module: $agp_module"
eval $LOGFE
}
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
## create array of gfx cards installed on system
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
get_graphics_card_data()
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local i='' a_temp=''
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
IFS=$'\n'
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
A_GRAPHICS_CARD_DATA=( $( gawk -F': ' '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
busId=""
new version, attempt 2 at detecting all possible syntaxes for cards. Now using the bus id itself to determine if the VGA compatible controller 3D controller Display Controller refer to separate chips or the same one. Bus id gives the data needed, because the video chip, the real card, that is, is on for example 00:05.0 the trailing .0 is the key, that's the actual card. The audio or display controller for the same card would be for example: 00:05.1 I don't know if this is fully reliable, but it will have to do, either some cards as is get missed, or some cards get double id'ed, unless I use a hack like this. There's nothing else I can find but the bus id to determine that it's the same physical device or not.
2014-03-19 04:31:40 +00:00
trueCard=""
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
removed display controller, need more data before using that
2014-03-19 03:18:23 +00:00
# not using 3D controller yet, needs research: |3D controller |display controller
new version, attempt 2 at detecting all possible syntaxes for cards. Now using the bus id itself to determine if the VGA compatible controller 3D controller Display Controller refer to separate chips or the same one. Bus id gives the data needed, because the video chip, the real card, that is, is on for example 00:05.0 the trailing .0 is the key, that's the actual card. The audio or display controller for the same card would be for example: 00:05.1 I don't know if this is fully reliable, but it will have to do, either some cards as is get missed, or some cards get double id'ed, unless I use a hack like this. There's nothing else I can find but the bus id to determine that it's the same physical device or not.
2014-03-19 04:31:40 +00:00
# note: this is strange, but all of these can be either a separate or the same
# card. However, by comparing bus id, say: 00:02.0 we can determine that the
# cards are either the same or different. We want only the .0 version as a valid
# card. .1 would be for example: Display Adapter with bus id x:xx.1, not the right one
/vga compatible controller|3D controller|Display controller/ {
gawk code cleanup, got rid of all one line flow controls, got rid of all ; separated statements, made all gawk code line up with columns it occurs in.
2008-11-06 20:58:35 +00:00
gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF)
gsub(/,/, " ", $NF)
gsub(/^ +| +$/, "", $NF)
gsub(/ [ \t]+/, " ", $NF)
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
busId=gensub(/^([0-9a-f:\.]+) (.+)$/,"\\1","",$1)
new version, attempt 2 at detecting all possible syntaxes for cards. Now using the bus id itself to determine if the VGA compatible controller 3D controller Display Controller refer to separate chips or the same one. Bus id gives the data needed, because the video chip, the real card, that is, is on for example 00:05.0 the trailing .0 is the key, that's the actual card. The audio or display controller for the same card would be for example: 00:05.1 I don't know if this is fully reliable, but it will have to do, either some cards as is get missed, or some cards get double id'ed, unless I use a hack like this. There's nothing else I can find but the bus id to determine that it's the same physical device or not.
2014-03-19 04:31:40 +00:00
trueCard=gensub(/(.*)\.([0-9]+)$/,"\\2","",busId)
if ( trueCard == 0 ) {
print $NF "," busId
}
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
}' <<< "$Lspci_v_Data" ) )
Fixed broken cache output, fixed bogomips output, created new cpu data function that takes core count and data number and creates correct value for all cores total
2008-11-03 22:37:57 +00:00
IFS="$ORIGINAL_IFS"
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
# for (( i=0; i < ${#A_GRAPHICS_CARD_DATA[@]}; i++ ))
Got rid of sanitize_data feature, which forces double dips into awk, instead I put hte cleaners for , and whitespace into each awk statement. This avoids exiting awk, then looping through the array in bash, then sending the array items to the cleaner function, back into awk, then sending it back, and rebuilding the array. I tried putting the gawk cleaners into a variable and using the variable, but that didn't work as expected, but I'll see if i can figure out how to get that working.
2008-11-06 20:32:19 +00:00
# do
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
# A_GRAPHICS_CARD_DATA[i]=$( sanitize_characters BAN_LIST_NORMAL "${A_GRAPHICS_CARD_DATA[i]}" )
Got rid of sanitize_data feature, which forces double dips into awk, instead I put hte cleaners for , and whitespace into each awk statement. This avoids exiting awk, then looping through the array in bash, then sending the array items to the cleaner function, back into awk, then sending it back, and rebuilding the array. I tried putting the gawk cleaners into a variable and using the variable, but that didn't work as expected, but I'll see if i can figure out how to get that working.
2008-11-06 20:32:19 +00:00
# done
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
# GFXMEM is UNUSED at the moment, because it shows AGP aperture size, which is not necessarily equal to GFX memory..
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
# GFXMEM="size=[$(echo "$Lspci_v_Data" | gawk '/VGA/{while (!/^$/) {getline;if (/size=[0-9][0-9]*M/) {size2=gensub(/.*\[size=([0-9]+)M\].*/,"\\1","g",$0);if (size<size2){size=size2}}}}END{print size2}')M]"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_GRAPHICS_CARD_DATA[@]}
log_function_data "A_GRAPHICS_CARD_DATA: $a_temp"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
}
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
get_graphics_driver()
{
eval $LOGFS
# list is from sgfxi plus non-free drivers
New version, new tarball. Fixed a bug in Xorg where it shows drivers as unloaded when they are actually loaded. Since we can't fix xorg, inxi will try to work around this bug by validating one step further in the Xorg.0.log data, to confirm that drivers noted as loaded/unloaded/failed are actually running the display(s) of the system. There is a possible case of error that might happen due to this change in the case of a system with a complex xorg that uses two drivers/modules to run two different displays, ie, nvidia on one, and amd on the other, for example, or intel/nvidia, etc. However, if that bug appears, we'll get that data set of debugging output and fix it at that point. This fix repairs an existing xorg bug that is unlikely to get fixed any time soon (the call to load the detected drivers, eg, vesa, intel, is repeated, causing a failure of driver already loaded on the second occurance.
2013-08-12 23:25:45 +00:00
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'
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local driver='' driver_string='' xorg_log_data='' status='' a_temp=''
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
if [[ $B_XORG_LOG == 'true' ]];then
A_GRAPHIC_DRIVERS=( $(
version upgrade: Optimized graphics driver function massively, knocked off about 60% of execution time by switching to a single read through via gawk.. In terms of dual core system, that saved literally about 1 second execution total time.
2011-06-13 22:31:22 +00:00
gawk '
BEGIN {
driver=""
New version, new tarball. Fixed a bug in Xorg where it shows drivers as unloaded when they are actually loaded. Since we can't fix xorg, inxi will try to work around this bug by validating one step further in the Xorg.0.log data, to confirm that drivers noted as loaded/unloaded/failed are actually running the display(s) of the system. There is a possible case of error that might happen due to this change in the case of a system with a complex xorg that uses two drivers/modules to run two different displays, ie, nvidia on one, and amd on the other, for example, or intel/nvidia, etc. However, if that bug appears, we'll get that data set of debugging output and fix it at that point. This fix repairs an existing xorg bug that is unlikely to get fixed any time soon (the call to load the detected drivers, eg, vesa, intel, is repeated, causing a failure of driver already loaded on the second occurance.
2013-08-12 23:25:45 +00:00
bLoaded="false"
IGNORECASE=1
version upgrade: Optimized graphics driver function massively, knocked off about 60% of execution time by switching to a single read through via gawk.. In terms of dual core system, that saved literally about 1 second execution total time.
2011-06-13 22:31:22 +00:00
}
New version, new tarball. Fixed a bug in Xorg where it shows drivers as unloaded when they are actually loaded. Since we can't fix xorg, inxi will try to work around this bug by validating one step further in the Xorg.0.log data, to confirm that drivers noted as loaded/unloaded/failed are actually running the display(s) of the system. There is a possible case of error that might happen due to this change in the case of a system with a complex xorg that uses two drivers/modules to run two different displays, ie, nvidia on one, and amd on the other, for example, or intel/nvidia, etc. However, if that bug appears, we'll get that data set of debugging output and fix it at that point. This fix repairs an existing xorg bug that is unlikely to get fixed any time soon (the call to load the detected drivers, eg, vesa, intel, is repeated, causing a failure of driver already loaded on the second occurance.
2013-08-12 23:25:45 +00:00
# note that in file names, driver is always lower case
version upgrade: Optimized graphics driver function massively, knocked off about 60% of execution time by switching to a single read through via gawk.. In terms of dual core system, that saved literally about 1 second execution total time.
2011-06-13 22:31:22 +00:00
/[[:space:]]Loading.*('"$driver_list"')_drv.so$/ {
driver=gensub(/.*[[:space:]]Loading.*('"$driver_list"')_drv.so/, "\\1", 1, $0 )
# we get all the actually loaded drivers first, we will use this to compare the
# failed/unloaded, which have not always actually been truly loaded
aDrivers[driver]="loaded"
}
/Unloading[[:space:]].*('"$driver_list"')(|_drv.so)$/ {
driver=gensub(/(.*)Unloading[[:space:]].*('"$driver_list"')(|_drv.so)$/, "\\2", 1, $0 )
# we need to make sure that the driver has already been truly loaded, not just discussed
if ( driver in aDrivers ) {
aDrivers[driver]="unloaded"
}
}
tweak
2011-07-19 23:58:14 +00:00
/Failed.*('"$driver_list"')_drv.so|Failed.*\"('"$driver_list"')\"/ {
(version jump, feature fix) fixed gfx driver failed state
2011-07-20 00:37:52 +00:00
driver=gensub(/(.*)Failed.*('"$driver_list"')_drv.so/, "\\2", 1, $0 )
if ( driver == $0 ) {
driver=gensub(/(.*)Failed.*\"('"$driver_list"')\".*|fred/, "\\2", 1, $0 )
}
version upgrade: Optimized graphics driver function massively, knocked off about 60% of execution time by switching to a single read through via gawk.. In terms of dual core system, that saved literally about 1 second execution total time.
2011-06-13 22:31:22 +00:00
# we need to make sure that the driver has already been truly loaded, not just discussed
(version jump, feature fix) fixed gfx driver failed state
2011-07-20 00:37:52 +00:00
if ( driver != $0 && driver in aDrivers ) {
version upgrade: Optimized graphics driver function massively, knocked off about 60% of execution time by switching to a single read through via gawk.. In terms of dual core system, that saved literally about 1 second execution total time.
2011-06-13 22:31:22 +00:00
aDrivers[driver]="failed"
}
}
New version, new tarball. Fixed a bug in Xorg where it shows drivers as unloaded when they are actually loaded. Since we can't fix xorg, inxi will try to work around this bug by validating one step further in the Xorg.0.log data, to confirm that drivers noted as loaded/unloaded/failed are actually running the display(s) of the system. There is a possible case of error that might happen due to this change in the case of a system with a complex xorg that uses two drivers/modules to run two different displays, ie, nvidia on one, and amd on the other, for example, or intel/nvidia, etc. However, if that bug appears, we'll get that data set of debugging output and fix it at that point. This fix repairs an existing xorg bug that is unlikely to get fixed any time soon (the call to load the detected drivers, eg, vesa, intel, is repeated, causing a failure of driver already loaded on the second occurance.
2013-08-12 23:25:45 +00:00
# verify that the driver actually started the desktop, even with false failed messages which can occur
# this is the driver that is actually driving the display
small fix, replaced \s with [[:space:]] to be consistent
2013-08-12 23:30:26 +00:00
/.*\([0-9]+\):[[:space:]]Depth.*framebuffer/ {
driver=gensub(/.*('"$driver_list"')\([0-9]+\):[[:space:]]Depth.*framebuffer.*/, "\\1", 1, $0 )
New version, new tarball. Fixed a bug in Xorg where it shows drivers as unloaded when they are actually loaded. Since we can't fix xorg, inxi will try to work around this bug by validating one step further in the Xorg.0.log data, to confirm that drivers noted as loaded/unloaded/failed are actually running the display(s) of the system. There is a possible case of error that might happen due to this change in the case of a system with a complex xorg that uses two drivers/modules to run two different displays, ie, nvidia on one, and amd on the other, for example, or intel/nvidia, etc. However, if that bug appears, we'll get that data set of debugging output and fix it at that point. This fix repairs an existing xorg bug that is unlikely to get fixed any time soon (the call to load the detected drivers, eg, vesa, intel, is repeated, causing a failure of driver already loaded on the second occurance.
2013-08-12 23:25:45 +00:00
# we need to make sure that the driver has already been truly loaded, not just discussed, also
# set driver to lower case because sometimes it will show as RADEON or NVIDIA in the actual x start
driver=tolower(driver)
if ( driver != $0 && driver in aDrivers ) {
aDrivers[driver]="loaded"
}
}
version upgrade: Optimized graphics driver function massively, knocked off about 60% of execution time by switching to a single read through via gawk.. In terms of dual core system, that saved literally about 1 second execution total time.
2011-06-13 22:31:22 +00:00
END {
variable cleanup
2011-06-14 00:39:47 +00:00
for ( driver in aDrivers ) {
print driver "," aDrivers[driver]
version upgrade: Optimized graphics driver function massively, knocked off about 60% of execution time by switching to a single read through via gawk.. In terms of dual core system, that saved literally about 1 second execution total time.
2011-06-13 22:31:22 +00:00
}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' < $FILE_XORG_LOG ) )
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_GRAPHIC_DRIVERS[@]}
log_function_data "A_GRAPHIC_DRIVERS: $a_temp"
new version: 1.5.7 Added to and improved debugging data collector. Options: -@ 11 -sys/networking; 12 - xorg; 13 - disk/partions. All also collect /proc data and some other stuff it's good to have examples of for future use. Added dwm and wmii desktops as well. Added support for standard --verbose and --help options. Added irc exit if help menu is called for to avoid bad spamming. Tweaked line count on System, made a touch shorter
2011-05-26 19:57:40 +00:00
eval $LOGFE
}
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
## create array of glx data
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
get_graphics_glx_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local a_temp=''
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ $B_SHOW_DISPLAY_DATA == 'true' && $B_ROOT != 'true' ]];then
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
IFS=$'\n'
Fixed messup with gfx arrays, mixed up glx and gfx
2008-10-30 07:23:45 +00:00
A_GLX_DATA=( $( glxinfo | gawk -F ': ' '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
# note: function declarations go before BEGIN? It appears so, confirm.
Finally tracked down and fixed the raijeken bug with wrong glx information showing, also added glx information for all cards, not just not free ones. After all, non free shouldn't show more information that free, that hardly seems fair.
2009-03-14 04:23:15 +00:00
# the real question here though is why this function is even here, seems
# just to be a complicated way to pack/print a variable, but maybe the
# original idea was to handle > 1 cases of detections I guess
function join( arr, sep ) {
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
s=""
i=flag=0
trying to handle weird space in name case
2009-02-26 17:15:09 +00:00
for ( i in arr ) {
if ( flag++ ) {
Fixed small gawk bug, needed == rather than =. Nice to see gawk actually is clear, logical, and consistent. Unlike Bash.
2008-11-18 21:05:21 +00:00
s = s sep
}
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
s = s i
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
}
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
return s
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
}
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
/opengl renderer/ {
final extra white space bug fix
2011-05-26 00:08:47 +00:00
gsub(/'"$BAN_LIST_NORMAL"'/, "", $2)
gsub(/ [ \t]+/, " ", $2) # get rid of the created white spaces
gsub(/^ +| +$/, "", $2)
trying to handle weird space in name case
2009-02-26 17:15:09 +00:00
if ( $2 ~ /mesa/ ) {
Finally tracked down and fixed the raijeken bug with wrong glx information showing, also added glx information for all cards, not just not free ones. After all, non free shouldn't show more information that free, that hardly seems fair.
2009-03-14 04:23:15 +00:00
# Allow all mesas
# if ( $2 ~ / r[3-9][0-9][0-9] / ) {
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
a[$2]
Finally tracked down and fixed the raijeken bug with wrong glx information showing, also added glx information for all cards, not just not free ones. After all, non free shouldn't show more information that free, that hardly seems fair.
2009-03-14 04:23:15 +00:00
# this counter failed in one case, a bug, and is not needed now
# f++
# }
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
next
Initial setup of repo
2008-10-28 00:40:43 +00:00
}
final extra white space bug fix
2011-05-26 00:08:47 +00:00
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
$2 && a[$2]
}
Finally tracked down and fixed the raijeken bug with wrong glx information showing, also added glx information for all cards, not just not free ones. After all, non free shouldn't show more information that free, that hardly seems fair.
2009-03-14 04:23:15 +00:00
# dropping all conditions from this test to just show full mesa information
# there is a user case where not f and mesa apply, atom mobo
# /opengl version/ && ( f || $2 !~ /mesa/ ) {
/opengl version/ {
removing some extra fglrx glx version information: Compatibility Profile Context This does not appear to communicate anything of value or interest
2011-05-29 03:39:55 +00:00
# fglrx started appearing with this extra string, does not appear to communicate anything of value
adding in CPC abbreviation on the off chance that 'Compatibility Profile Context' actually means something for fglrx opengl version
2011-05-29 16:37:22 +00:00
sub(/Compatibility Profile Context/, "- CPC", $2 )
added white space cleanup
2011-05-29 03:42:23 +00:00
gsub(/ [ \t]+/, " ", $2) # get rid of the created white spaces
removing some extra fglrx glx version information: Compatibility Profile Context This does not appear to communicate anything of value or interest
2011-05-29 03:39:55 +00:00
gsub(/^ +| +$/, "", $2)
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
$2 && b[$2]
}
/direct rendering/ {
$2 && c[$2]
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
END {
Finally tracked down and fixed the raijeken bug with wrong glx information showing, also added glx information for all cards, not just not free ones. After all, non free shouldn't show more information that free, that hardly seems fair.
2009-03-14 04:23:15 +00:00
printf( "%s\n%s\n%s\n", join( a, ", " ), join( b, ", " ), join( c, ", " ) )
Made all awk code endings the same, }' )... in all cases, or }' /file/path, or whatever
2008-11-06 21:39:18 +00:00
}' ) )
Fixed broken cache output, fixed bogomips output, created new cpu data function that takes core count and data number and creates correct value for all cores total
2008-11-03 22:37:57 +00:00
IFS="$ORIGINAL_IFS"
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
# GLXR=$(glxinfo | gawk -F ': ' 'BEGIN {IGNORECASE=1} /opengl renderer/ && $2 !~ /mesa/ {seen[$2]++} END {for (i in seen) {printf("%s ",i)}}')
# GLXV=$(glxinfo | gawk -F ': ' 'BEGIN {IGNORECASE=1} /opengl version/ && $2 !~ /mesa/ {seen[$2]++} END {for (i in seen) {printf("%s ",i)}}')
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_GLX_DATA[@]}
log_function_data "A_GLX_DATA: $a_temp"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
}
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
## return screen resolution / tty resolution
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
get_graphics_res_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
local screen_resolution='' xdpy_data='' screens_count=0 tty_session=''
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ $B_SHOW_DISPLAY_DATA == 'true' && $B_ROOT != 'true' ]];then
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
# Added the two ?'s , because the resolution is now reported without spaces around the 'x', as in
# 1400x1050 instead of 1400 x 1050. Change as of X.org version 1.3.0
added handling for multiple res for multiple screens in special cases with multiple video cards
2010-10-08 06:05:34 +00:00
xdpy_data="$( xdpyinfo )"
xdpy_count=$( grep -c 'dimensions' <<< "$xdpy_data" )
# we get a bit more info from xrandr than xdpyinfo, but xrandr fails to handle
# multiple screens from different video cards
if [[ $xdpy_count -eq 1 ]];then
screen_resolution=$( xrandr | gawk '
/\*/ {
res[++m] = gensub(/^.* ([0-9]+) ?x ?([0-9]+)[_ ].* ([0-9\.]+)\*.*$/,"\\1x\\2@\\3hz","g",$0)
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
}
added handling for multiple res for multiple screens in special cases with multiple video cards
2010-10-08 06:05:34 +00:00
END {
for (n in res) {
if (res[n] ~ /^[[:digit:]]+x[[:digit:]]+/) {
line = line ? line ", " res[n] : res[n]
}
}
if (line) {
print(line)
}
}' )
fi
if [[ -z $screen_resolution || $xdpy_count -gt 1 ]];then
screen_resolution=$( gawk '
BEGIN {
IGNORECASE=1
screens = ""
separator = ""
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
/dimensions/ {
fixed small multi card screen res bug, logic for comma placement was slightly wrong
2010-12-10 20:51:31 +00:00
screens = screens separator # first time, this is null, next, has comma last
screens = screens $2 # then tack on the new value for nice comma list
added handling for multiple res for multiple screens in special cases with multiple video cards
2010-10-08 06:05:34 +00:00
separator = ", "
}
END {
print screens
}' <<< "$xdpy_data" )
Initial setup of repo
2008-10-28 00:40:43 +00:00
fi
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
else
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ $B_PROC_DIR == 'true' && -z $BSD_TYPE ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
screen_resolution=$( stty -F $( readlink /proc/$PPID/fd/0 ) size | gawk '{
print $2"x"$1
}' )
# note: this works fine for all systems but keeping the above for now since
# the above is probably more accurate for linux systems.
else
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ $B_CONSOLE_IRC != 'true' ]];then
screen_resolution=$( stty -a | gawk -F ';' '
/^speed/ {
gsub(/[[:space:]]*(rows|columns)[[:space:]]*/,"",$0)
gsub(/[[:space:]]*/,"",$2)
gsub(/[[:space:]]*/,"",$3)
print $3"x"$2
}' )
else
if [[ -n $BSD_TYPE ]];then
tty_session=$( get_tty_console_irc )
# getting information for tty that owns the irc client
screen_resolution="$( stty -f /dev/pts/$tty_session size | gawk '{print $2"x"$1}' )"
fi
fi
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
fi
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
fi
echo "$screen_resolution"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "screen_resolution: $screen_resolution"
eval $LOGFE
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
}
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
## create array of display server vendor/version data
get_graphics_display_server_data()
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local vendor='' version='' a_temp='' xdpy_info='' a_display_vendor_working=''
bug fix, new patch version, forgot to remove a debugger thing yesterday.
2011-06-22 18:09:01 +00:00
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ $B_SHOW_DISPLAY_DATA == 'true' && $B_ROOT != 'true' ]];then
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
# X vendor and version detection.
tried a bit more optimization for -G, but it turns out it's glxinfo itself that is slow, so the only way to really get -G sped up is to redo the way inxi gets the glxinfo data.
2011-06-21 00:58:51 +00:00
# new method added since radeon and X.org and the disappearance of <X server name> version : ...etc
# Later on, the normal textual version string returned, e.g. like: X.Org version: 6.8.2
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
# A failover mechanism is in place. (if $version is empty, the release number is parsed instead)
tried a bit more optimization for -G, but it turns out it's glxinfo itself that is slow, so the only way to really get -G sped up is to redo the way inxi gets the glxinfo data.
2011-06-21 00:58:51 +00:00
# xdpy_info="$( xdpyinfo )"
IFS=","
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
a_display_vendor_working=( $( xdpyinfo | gawk -F': +' '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
tried a bit more optimization for -G, but it turns out it's glxinfo itself that is slow, so the only way to really get -G sped up is to redo the way inxi gets the glxinfo data.
2011-06-21 00:58:51 +00:00
vendorString=""
version=""
vendorRelease=""
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
/vendor string/ {
fixed typo in awk in get gfx x data
2008-11-06 21:33:14 +00:00
gsub(/the|inc|foundation|project|corporation/, "", $2)
Got rid of sanitize_data feature, which forces double dips into awk, instead I put hte cleaners for , and whitespace into each awk statement. This avoids exiting awk, then looping through the array in bash, then sending the array items to the cleaner function, back into awk, then sending it back, and rebuilding the array. I tried putting the gawk cleaners into a variable and using the variable, but that didn't work as expected, but I'll see if i can figure out how to get that working.
2008-11-06 20:32:19 +00:00
gsub(/,/, " ", $2)
gsub(/^ +| +$/, "", $2)
gsub(/ [ \t]+/, " ", $2)
tried a bit more optimization for -G, but it turns out it's glxinfo itself that is slow, so the only way to really get -G sped up is to redo the way inxi gets the glxinfo data.
2011-06-21 00:58:51 +00:00
vendorString = $2
}
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
/version:/ {
tried a bit more optimization for -G, but it turns out it's glxinfo itself that is slow, so the only way to really get -G sped up is to redo the way inxi gets the glxinfo data.
2011-06-21 00:58:51 +00:00
version = $NF
}
/vendor release number/ {
gsub(/0+$/, "", $2)
gsub(/0+/, ".", $2)
vendorRelease = $2
}
END {
print vendorString "," version "," vendorRelease
}' ) )
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
vendor=${a_display_vendor_working[0]}
version=${a_display_vendor_working[1]}
tried a bit more optimization for -G, but it turns out it's glxinfo itself that is slow, so the only way to really get -G sped up is to redo the way inxi gets the glxinfo data.
2011-06-21 00:58:51 +00:00
added in out of X, root support for showing X.org version
2010-08-24 21:27:47 +00:00
# this gives better output than the failure last case, which would only show:
# for example: X.org: 1.9 instead of: X.org: 1.9.0
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ -z $version ]];then
version=$( get_graphics_display_server_version )
added in out of X, root support for showing X.org version
2010-08-24 21:27:47 +00:00
fi
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ -z $version ]];then
version=${a_display_vendor_working[2]}
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
fi
added in handling for when the vendor string for xorg is NOT xorg, but something else, like fedora
2010-08-24 20:10:32 +00:00
# some distros, like fedora, report themselves as the xorg vendor, so quick check
# here to make sure the vendor string includes Xorg in string
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ -z $( grep -E '(X|xorg|x\.org)' <<< $vendor ) ]];then
vendor="$vendor X.org"
added in handling for when the vendor string for xorg is NOT xorg, but something else, like fedora
2010-08-24 20:10:32 +00:00
fi
tried a bit more optimization for -G, but it turns out it's glxinfo itself that is slow, so the only way to really get -G sped up is to redo the way inxi gets the glxinfo data.
2011-06-21 00:58:51 +00:00
IFS="$ORIGINAL_IFS"
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
A_DISPLAY_SERVER_DATA[0]="$vendor"
A_DISPLAY_SERVER_DATA[1]="$version"
added in out of X, root support for showing X.org version
2010-08-24 21:27:47 +00:00
else
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
version=$( get_graphics_display_server_version )
if [[ -n $version ]];then
vendor='X.org'
A_DISPLAY_SERVER_DATA[0]="$vendor"
A_DISPLAY_SERVER_DATA[1]="$version"
added in out of X, root support for showing X.org version
2010-08-24 21:27:47 +00:00
fi
Initial setup of repo
2008-10-28 00:40:43 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_DISPLAY_SERVER_DATA[@]}
log_function_data "A_DISPLAY_SERVER_DATA: $a_temp"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
}
tried a bit more optimization for -G, but it turns out it's glxinfo itself that is slow, so the only way to really get -G sped up is to redo the way inxi gets the glxinfo data.
2011-06-21 00:58:51 +00:00
added in out of X, root support for showing X.org version
2010-08-24 21:27:47 +00:00
# if other tests fail, try this one, this works for root, out of X also
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
get_graphics_display_server_version()
added in out of X, root support for showing X.org version
2010-08-24 21:27:47 +00:00
{
eval $LOGFS
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
local version='' x_data=''
added Xorg -version testing to debugger and x version function
2011-06-06 20:55:44 +00:00
# note that some users can have /usr/bin/Xorg but not /usr/bin/X
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p X &>/dev/null;then
added in out of X, root support for showing X.org version
2010-08-24 21:27:47 +00:00
# note: MUST be this syntax: X -version 2>&1
# otherwise X -version overrides everything and this comes out null.
fixed a glitch in x version, out of x tests can fail if strings contain (...) type endings, which newer debian's do.
2011-07-20 04:11:44 +00:00
# two knowns id strings: X.Org X Server 1.7.5 AND X Window System Version 1.7.5
added in out of X, root support for showing X.org version
2010-08-24 21:27:47 +00:00
#X -version 2>&1 | gawk '/^X Window System Version/ { print $5 }'
fixed a glitch in x version, out of x tests can fail if strings contain (...) type endings, which newer debian's do.
2011-07-20 04:11:44 +00:00
x_data="$( X -version 2>&1 )"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif type -p Xorg &>/dev/null;then
fixed a glitch in x version, out of x tests can fail if strings contain (...) type endings, which newer debian's do.
2011-07-20 04:11:44 +00:00
x_data="$( Xorg -version 2>&1)"
fi
if [[ -n $x_data ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
version=$(
fixed a glitch in x version, out of x tests can fail if strings contain (...) type endings, which newer debian's do.
2011-07-20 04:11:44 +00:00
gawk '
added Xorg -version testing to debugger and x version function
2011-06-06 20:55:44 +00:00
BEGIN {
IGNORECASE=1
}
fixed a glitch in x version, out of x tests can fail if strings contain (...) type endings, which newer debian's do.
2011-07-20 04:11:44 +00:00
/^x.org x server/ {
print $4
exit
}
/^X Window System Version/ {
print $5
exit
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' <<< "$x_data" )
added in out of X, root support for showing X.org version
2010-08-24 21:27:47 +00:00
fi
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
echo $version
log_function_data " version: $version"
added in out of X, root support for showing X.org version
2010-08-24 21:27:47 +00:00
eval $LOGFE
}
Initial setup of repo
2008-10-28 00:40:43 +00:00
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
# this gets just the raw data, total space/percent used and disk/name/per disk capacity
get_hdd_data_basic()
refactored and ordered get data functions
2008-10-30 05:04:11 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local hdd_used='' a_temp='' df_string=''
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
local hdd_data='' df_test=''
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ -z $BSD_TYPE ]];then
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
df_string='df -P -T --exclude-type=aufs --exclude-type=devfs --exclude-type=devtmpfs
--exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs
--exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs'
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
else
# default size is 512, so use -k for 1024
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
df_string='df -T -k'
# default size is 512, -H only for size in human readable format
# older bsds don't support -T, pain, so we'll use partial output there
df_test=$( df -H -T 2>/dev/null )
if [[ -n $df_test ]];then
df_string='df -k -T'
else
df_string='df -k'
fi
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
fi
hdd_data="$( eval $df_string )"
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
log_function_data 'raw' "hdd_data:\n$hdd_data"
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
hdd_used=$( echo "$hdd_data" | gawk -v bsdType=$BSD_TYPE '
New version, tarball. Fixed a small issue that would create a wrong reporting of disk useage if bind mounts are used, ie, multiple binds to a single mount. Now inxi will check a list of the previously used partitions before adding the size of the used space to the total used, if the partition has already been used it will skip it. This was/is a quick and dirty fix, but it's totally fine I believe and should resolve two separate issues: 1. use of bind mount method, where multiple partition names are bound to the same partition 2. accidental dual mounting to the same partition. partitions section will still show the same data, ie, if bind is used, it will show all the bind mounts even when they are attached/bound to a partition that is already listed. This seems useful information, though maybe we can get the key word 'bind' in there somehow, but for now I won't worry about that issue, that's just a nice to have, not a bug.
2013-05-03 20:57:40 +00:00
BEGIN {
# this is used for specific cases where bind, or incorrect multiple mounts to same partitions,
# is present. The value is searched for an earlier appearance of that partition and if it is
# present, the data is not added into the partition used size.
partitionsSet=""
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
# this handles a case where the same dev item is mounted twice to different points
devSet=""
devWorking=""
mountWorking=""
New version, tarball. Fixed a small issue that would create a wrong reporting of disk useage if bind mounts are used, ie, multiple binds to a single mount. Now inxi will check a list of the previously used partitions before adding the size of the used space to the total used, if the partition has already been used it will skip it. This was/is a quick and dirty fix, but it's totally fine I believe and should resolve two separate issues: 1. use of bind mount method, where multiple partition names are bound to the same partition 2. accidental dual mounting to the same partition. partitions section will still show the same data, ie, if bind is used, it will show all the bind mounts even when they are attached/bound to a partition that is already listed. This seems useful information, though maybe we can get the key word 'bind' in there somehow, but for now I won't worry about that issue, that's just a nice to have, not a bug.
2013-05-03 20:57:40 +00:00
}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# using $1, not $2, because older bsd df do not have -T, filesystem type
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
( bsdType != "" ) && $1 ~ /^(aufs|devfs|devtmpfs|fdescfs|filesystem|iso9660|linprocfs|procfs|squashfs|sysfs|tmpfs|type|unionfs)$/ {
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
# note use next, not getline or it does not work right
next
}
New version, small bug fix, inxi failed to add in md raid partition size data to HDD used data. The hdd used still fails to properly calculate the actual raid sizes but that's a bit too tricky to do easily so will leave that for some other time. Also added in more hdd used partition types for bsds, wd and ad type drivers for disks.
2013-02-28 07:15:13 +00:00
# also handles odd dm-1 type, from lvm, and mdraid, and some other bsd partition syntax
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
# note that linux 3.2.45-grsec-9th types kernels have this type of partition name: /dev/xvdc (no number, letter)
/^\/dev\/(mapper\/|[hsv]d[a-z][0-9]+|dm[-]?[0-9]+|ada[0-9]+p[0-9]+.*|md[0-9]+|[aw]d[0-9]+s.*|xvd[a-z])/ {
fixed bug with space in user partition names in hard disk size
2009-01-09 02:24:25 +00:00
# this handles the case where the first item is too long
# and makes df wrap output to next line, so here we advance
added -P to df to avoid wrapping long lines. -P for posix, which means do not wrap long lines I guess.
2011-07-13 01:27:46 +00:00
# it to the next line for that single case. Using df -P should
# make this unneeded but leave it in just in case
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if ( NF < 6 && $0 !~ /.*%/ ) {
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
devSet = devSet "~" $1 "~"
fixed bug with space in user partition names in hard disk size
2009-01-09 02:24:25 +00:00
getline
}
# if the first item caused a wrap, use one less than standard
added comment to clarify tests
2009-01-09 03:24:37 +00:00
# testing for the field with % in it, ie: 34%, then go down from there
improved comments
2009-01-09 03:45:32 +00:00
# this also protects against cases where the mount point has a space in the
# file name, thus breaking going down from $NF directly.
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
# some bsds will also have only 6 items
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if ( $5 ~ /.*%/ ) {
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
devWorking="~" $1 "~"
mountWorking="~" $6 "~"
if ( partitionsSet !~ mountWorking && devSet !~ devWorking ) {
New version, tarball. Fixed a small issue that would create a wrong reporting of disk useage if bind mounts are used, ie, multiple binds to a single mount. Now inxi will check a list of the previously used partitions before adding the size of the used space to the total used, if the partition has already been used it will skip it. This was/is a quick and dirty fix, but it's totally fine I believe and should resolve two separate issues: 1. use of bind mount method, where multiple partition names are bound to the same partition 2. accidental dual mounting to the same partition. partitions section will still show the same data, ie, if bind is used, it will show all the bind mounts even when they are attached/bound to a partition that is already listed. This seems useful information, though maybe we can get the key word 'bind' in there somehow, but for now I won't worry about that issue, that's just a nice to have, not a bug.
2013-05-03 20:57:40 +00:00
used += $3
}
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
partitionsSet = partitionsSet mountWorking
# make sure to only include bsd real lines here, ie, short df output
if ( $1 ~ /^\/dev\// ) {
devSet = devSet devWorking
}
fixed bug with space in user partition names in hard disk size
2009-01-09 02:24:25 +00:00
}
# otherwise use standard
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
else if ( $6 ~ /.*%/ ) {
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
devWorking="~" $1 "~"
mountWorking="~" $7 "~"
if ( partitionsSet !~ mountWorking && devSet !~ devWorking ) {
New version, tarball. Fixed a small issue that would create a wrong reporting of disk useage if bind mounts are used, ie, multiple binds to a single mount. Now inxi will check a list of the previously used partitions before adding the size of the used space to the total used, if the partition has already been used it will skip it. This was/is a quick and dirty fix, but it's totally fine I believe and should resolve two separate issues: 1. use of bind mount method, where multiple partition names are bound to the same partition 2. accidental dual mounting to the same partition. partitions section will still show the same data, ie, if bind is used, it will show all the bind mounts even when they are attached/bound to a partition that is already listed. This seems useful information, though maybe we can get the key word 'bind' in there somehow, but for now I won't worry about that issue, that's just a nice to have, not a bug.
2013-05-03 20:57:40 +00:00
used += $4
}
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
partitionsSet = partitionsSet mountWorking
devSet = devSet devWorking
fixed bug with space in user partition names in hard disk size
2009-01-09 02:24:25 +00:00
}
# and if this is not detected, give up, we need user data to debug
else {
next
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
}
}
END {
fixed bug with space in user partition names in hard disk size
2009-01-09 02:24:25 +00:00
print used
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
}' )
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
(Change Version) A series of bug and potential bug fixes: 1. In get distro data, improved handling of unfound distros significanly, handling lsb-release testing as a fall back in 2 cases. 2. Created a new get_distro_lsb_data function to handle that processing 3. Added a last test for lsb-release presence. 4. Fixed a small bug that made ubuntu live cd hard disk size display fail.
2008-11-11 02:31:29 +00:00
if [[ -z $hdd_used ]];then
hdd_used='na'
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "hdd_used: $hdd_used"
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
# create the initial array strings:
Added array item, usb, for advanced hard disk output
2008-11-08 21:56:16 +00:00
# disk-dev, capacity, name, usb or not
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
# final item is the total of the disk
IFS=$'\n'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
if [[ $B_PARTITIONS_FILE == 'true' ]];then
(change version) New feature in swap partition data: show percent used, this is a damentz patch
2009-03-02 00:52:09 +00:00
A_HDD_DATA=( $(
gawk -v hddused="$hdd_used" '
added support for virtual disks, like /dev/vda3 for partitions / disks
2011-04-21 01:16:09 +00:00
/[hsv]d[a-z]$/ {
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
driveSize = $(NF - 1)*1024/1000**3
gsub(/,/, " ", driveSize)
gsub(/^ +| +$/, "", driveSize)
printf( $NF",%.1fGB,,\n", driveSize )
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
}
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
# See http://lanana.org/docs/device-list/devices-2.6+.txt for major numbers used below
(change version) New feature in swap partition data: show percent used, this is a damentz patch
2009-03-02 00:52:09 +00:00
# $1 ~ /^(3|22|33|8)$/ && $2 % 16 == 0 {
# size += $3
# }
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
# special case from this data: 8 0 156290904 sda
added a comment to clarify
2013-06-15 00:28:38 +00:00
# note: vm has 252/253/254 known starter, grsec has 202
no new version number, but a bug fix anyway, added in another vm disk drive fix. Don't want to inflate inxi versions needlessly.
2013-06-15 00:16:32 +00:00
$1 ~ /^(3|8|22|33|202|252|253|254)$/ && $NF ~ /[hsv]d[a-z]$/ && ( $2 % 16 == 0 || $2 % 16 == 8 ) {
fixed bug with space in user partition names in hard disk size
2009-01-09 02:24:25 +00:00
size += $3
}
(change version) New feature in swap partition data: show percent used, this is a damentz patch
2009-03-02 00:52:09 +00:00
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
END {
size = size*1024/1000**3 # calculate size in GB size
workingUsed = hddused*1024/1000**3 # calculate workingUsed in GB used
# this handles a special case with livecds where no hdd_used is detected
if ( size > 0 && hddused == "na" ) {
size = sprintf( "%.1f", size )
print size "GB,-"
}
else if ( size > 0 && workingUsed > 0 ) {
diskUsed = workingUsed*100/size # calculate used percentage
diskUsed = sprintf( "%.1f", diskUsed )
size = sprintf( "%.1f", size )
print size "GB," diskUsed "% used"
}
else {
print "NA,-" # print an empty array, this will be further handled in the print out function
}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' $FILE_PARTITIONS ) )
bug fix on disk size handling, some vm disk use the start number 252 in /proc/partitions, inxi failed to handle that, and so failed to show proper disk size in virtual machine. New tarball/version number.
2012-12-22 20:11:43 +00:00
log_function_data 'cat' "$FILE_PARTITIONS"
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
fi
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
IFS="$ORIGINAL_IFS"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_HDD_DATA[@]}
log_function_data "A_HDD_DATA: $a_temp"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
## fills out the A_HDD_DATA array with disk names
get_hard_drive_data_advanced()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
Fixed a bug with WDC, requires for the ls -l /dev/disk/by-id test replacing whitespace with _, and trimming off the last part of the string
2008-11-08 05:18:01 +00:00
local a_temp_working='' a_temp_scsi='' temp_holder='' temp_name='' i='' j=''
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local sd_ls_by_id='' ls_disk_by_id='' usb_exists='' a_temp=''
Made all awk gawk to keep it consistent, this is the type of randomness we need to avoid in the future.
2008-11-07 19:59:11 +00:00
Changed failure to find device name to: Name n/a
2008-11-08 07:24:52 +00:00
## check for all ide type drives, non libata, only do it if hdx is in array
(change version) updated to handle new /sys/block syntax to get device name for disks. This will require further work to actually make solid, but this fix makes it work for now.
2010-02-07 07:47:07 +00:00
## this is now being updated for new /sys type paths, this may handle that ok too
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
if [[ -n $( grep -E 'hd[a-z]' <<< ${A_HDD_DATA[@]} ) ]];then
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
# remember, we're using the last array item to store the total size of disks
for (( i=0; i < ${#A_HDD_DATA[@]} - 1; i++ ))
do
IFS=","
a_temp_working=( ${A_HDD_DATA[i]} )
IFS="$ORIGINAL_IFS"
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
if [[ -n $( grep -E '^hd[a-z]' <<< ${a_temp_working[0]} ) ]];then
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
if [[ -e /proc/ide/${a_temp_working[0]}/model ]];then
a_temp_working[2]="$( remove_erroneous_chars /proc/ide/${a_temp_working[0]}/model )"
else
Changed failure to find device name to: Name n/a
2008-11-08 07:24:52 +00:00
a_temp_working[2]="Name n/a"
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
fi
updated trunk inxi
2009-05-28 20:26:29 +00:00
# these loops are to easily extend the cpu array created in the gawk script above with more fields per cpu.
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
for (( j=0; j < ${#a_temp_working[@]}; j++ ))
do
if [[ $j -gt 0 ]];then
A_HDD_DATA[i]="${A_HDD_DATA[i]},${a_temp_working[$j]}"
else
A_HDD_DATA[i]="${a_temp_working[$j]}"
fi
done
fi
done
refactored and ordered get data functions
2008-10-30 05:04:11 +00:00
fi
Made sound show with -s option; removed showing help menu on mistyped option, or unsupported option, this would make spammy irc stuff. Instead shows message to run inxi -h for more information
2008-11-07 20:45:25 +00:00
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
## then handle libata names
# first get the ata device names, put them into an array
Fixed testing bug for advanced sdx name detection
2008-11-09 07:07:48 +00:00
IFS=$'\n'
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
if [[ $B_SCSI_FILE == 'true' ]]; then
Fixed testing bug for advanced sdx name detection
2008-11-09 07:07:48 +00:00
a_temp_scsi=( $( gawk '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
}
Fixed testing bug for advanced sdx name detection
2008-11-09 07:07:48 +00:00
/host/ {
getline a[$0]
getline b[$0]
}
END {
for (i in a) {
if (b[i] ~ / *type: *direct-access.*/) {
#c=gensub(/^ *vendor: (.+) +model: (.+) +rev: (.+)$/,"\\1 \\2 \\3","g",a[i])
#c=gensub( /^ *vendor: (.+) +model: (.+) +rev:.*$/,"\\1 \\2","g",a[i] )
# the vendor: string is useless, and is a bug, ATA is not a vendor for example
c=gensub( /^ *vendor: (.+) +model: (.+) +rev:.*$/, "\\2", "g", a[i] )
gsub(/,/, " ", c)
gsub(/^ +| +$/, "", c)
gsub(/ [ \t]+/, " ", c)
#print a[i]
# we actually want this data, so leaving this off for now
# if (c ~ /\<flash\>|\<pendrive\>|memory stick|memory card/) {
# continue
# }
print c
Trying the locsmif method, querying /proc/scsi/scsi directly instead, a failure case was discovered there.
2008-11-08 23:21:53 +00:00
}
Fixed testing bug for advanced sdx name detection
2008-11-09 07:07:48 +00:00
}
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}' $FILE_SCSI ) )
log_function_data 'cat' "$FILE_SCSI"
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
fi
Fixed testing bug for advanced sdx name detection
2008-11-09 07:07:48 +00:00
IFS="$ORIGINAL_IFS"
Made sound show with -s option; removed showing help menu on mistyped option, or unsupported option, this would make spammy irc stuff. Instead shows message to run inxi -h for more information
2008-11-07 20:45:25 +00:00
(change version) Some last code cleanup, comment cleanup, tweaked a few small things.
2008-11-11 23:36:25 +00:00
## then we'll loop through that array looking for matches.
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
if [[ -n $( grep -E 'sd[a-z]' <<< ${A_HDD_DATA[@]} ) ]];then
Added to partition output, swap data, still not with percent of swap used, but that's for another day.
2008-11-10 01:10:22 +00:00
# first pack the main ls variable so we don't have to keep using ls /dev...
New version: desktop/dm added: WindowMaker, WM2. Also added in legacy wmii2 which may work. windowmaker and wm2 are detected via xprop -root, there is no version information for wm2 available so if you know how to detect that, let me know. New tarball as well, though no man page changes.
2013-01-09 19:33:08 +00:00
# not all systems have /dev/disk/by-id
ls_disk_by_id="$( ls -l /dev/disk/by-id 2>/dev/null )"
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
for (( i=0; i < ${#A_HDD_DATA[@]} - 1; i++ ))
do
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
if [[ -n $( grep -E '^sd[a-z]' <<< ${A_HDD_DATA[$i]} ) ]];then
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
IFS=","
a_temp_working=( ${A_HDD_DATA[$i]} )
IFS="$ORIGINAL_IFS"
(change version) updated to handle new /sys/block syntax to get device name for disks. This will require further work to actually make solid, but this fix makes it work for now.
2010-02-07 07:47:07 +00:00
# /sys/block/[sda,hda]/device/model
# this is handles the new /sys data types first
if [[ -e /sys/block/${a_temp_working[0]}/device/model ]];then
(change version) the inevitable bug with method change, updated and restored lost features using /sys/block method
2010-02-07 08:25:27 +00:00
temp_name="$( remove_erroneous_chars /sys/block/${a_temp_working[0]}/device/model )"
temp_name=$( tr ' ' '_' <<< $temp_name | cut -d '-' -f 1 )
(change version) updated to handle new /sys/block syntax to get device name for disks. This will require further work to actually make solid, but this fix makes it work for now.
2010-02-07 07:47:07 +00:00
elif [[ ${#a_temp_scsi[@]} -gt 0 ]];then
Added null data handler for temp array scsi
2008-11-08 22:26:16 +00:00
for (( j=0; j < ${#a_temp_scsi[@]}; j++ ))
do
## ok, ok, it's incomprehensible, search /dev/disk/by-id for a line that contains the
# discovered disk name AND ends with the correct identifier, sdx
# get rid of whitespace for some drive names and ids, and extra data after - in name
temp_name=$( tr ' ' '_' <<< ${a_temp_scsi[$j]} | cut -d '-' -f 1 )
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
sd_ls_by_id=$( grep -Em1 ".*$temp_name.*${a_temp_working[0]}$" <<< "$ls_disk_by_id" )
Cleaned up some testing cases, removed and cleaned up comments, tweaked the full hard drive output a bit
2008-11-09 20:20:23 +00:00
Added null data handler for temp array scsi
2008-11-08 22:26:16 +00:00
if [[ -n $sd_ls_by_id ]];then
(change version) the inevitable bug with method change, updated and restored lost features using /sys/block method
2010-02-07 08:25:27 +00:00
temp_name=${a_temp_scsi[$j]}
Added null data handler for temp array scsi
2008-11-08 22:26:16 +00:00
break
else
bug fix for missing names for hard disks, now shows temp data content instead of Name n/a, which is more useful.
2009-07-30 00:21:12 +00:00
# test to see if we can get a better name output when null
if [[ -n $temp_name ]];then
(change version) the inevitable bug with method change, updated and restored lost features using /sys/block method
2010-02-07 08:25:27 +00:00
temp_name=$temp_name
bug fix for missing names for hard disks, now shows temp data content instead of Name n/a, which is more useful.
2009-07-30 00:21:12 +00:00
fi
Added array item, usb, for advanced hard disk output
2008-11-08 21:56:16 +00:00
fi
Added null data handler for temp array scsi
2008-11-08 22:26:16 +00:00
done
fi
(change version) the inevitable bug with method change, updated and restored lost features using /sys/block method
2010-02-07 08:25:27 +00:00
if [[ -z $temp_name ]];then
temp_name="Name n/a"
else
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
usb_exists=$( grep -Em1 "usb-.*$temp_name.*${a_temp_working[0]}$" <<< "$ls_disk_by_id" )
(change version) the inevitable bug with method change, updated and restored lost features using /sys/block method
2010-02-07 08:25:27 +00:00
if [[ -n $usb_exists ]];then
a_temp_working[3]='USB'
fi
fi
a_temp_working[2]=$temp_name
updated trunk inxi
2009-05-28 20:26:29 +00:00
# these loops are to easily extend the cpu array created in the gawk script above with more fields per cpu.
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
for (( j=0; j < ${#a_temp_working[@]}; j++ ))
do
if [[ $j -gt 0 ]];then
A_HDD_DATA[i]="${A_HDD_DATA[i]},${a_temp_working[$j]}"
else
A_HDD_DATA[i]="${a_temp_working[$j]}"
fi
done
fi
done
Added to partition output, swap data, still not with percent of swap used, but that's for another day.
2008-11-10 01:10:22 +00:00
unset ls_disk_by_id # and then let's dump the data we don't need
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_HDD_DATA[@]}
log_function_data "A_HDD_DATA: $a_temp"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
}
Made sound show with -s option; removed showing help menu on mistyped option, or unsupported option, this would make spammy irc stuff. Instead shows message to run inxi -h for more information
2008-11-07 20:45:25 +00:00
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
# args: $1 - which drive to get serial number of
get_hdd_serial_number()
{
eval $LOGFS
local hdd_serial=''
get_partition_dev_data 'id'
# lrwxrwxrwx 1 root root 9 Apr 26 09:32 scsi-SATA_ST3160827AS_5MT2HMH6 -> ../../sdc
# exit on the first instance
hdd_serial=$( gawk '
/'$1'$/ {
serial=gensub( /^(.+)_([^_]+)$/, "\\2", 1, $9 )
print serial
exit
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' <<< "$DEV_DISK_ID" )
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
echo $hdd_serial
log_function_data "hdd serial: $hdd_serial"
eval $LOGFE
}
(change version) small new feature: show with -x, extra options, hddtemp data for -D data, if hddtemp installed, and if user root, or if user is in /etc/sudoers with: <username> ALL = NOPASSWD: /usr/sbin/hddtemp Another nice little sys admin thing.
2009-08-03 03:57:20 +00:00
# a few notes, normally hddtemp requires root, but you can set user rights in /etc/sudoers.
# args: $1 - /dev/<disk> to be tested for
get_hdd_temp_data()
{
added file system type for unmounted fs, if available. Uses file -s, can add it to sudoers if you want to run it as regular user.
2010-01-09 19:20:40 +00:00
eval $LOGFS
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
local hdd_temp='' sudo_command=''
(Change Version) Optimized to not do repeated tests of tools for functions that are used more than one time. Added boolean tested flags, and global app path variables to handle this. this can knock off up to 10 or more type -p app exists type tests for one script execution.
2010-01-29 23:31:20 +00:00
if [[ $B_HDDTEMP_TESTED != 'true' ]];then
B_HDDTEMP_TESTED='true'
HDDTEMP_PATH=$( type -p hddtemp )
fi
if [[ $B_SUDO_TESTED != 'true' ]];then
B_SUDO_TESTED='true'
SUDO_PATH=$( type -p sudo )
fi
(change version) small new feature: show with -x, extra options, hddtemp data for -D data, if hddtemp installed, and if user root, or if user is in /etc/sudoers with: <username> ALL = NOPASSWD: /usr/sbin/hddtemp Another nice little sys admin thing.
2009-08-03 03:57:20 +00:00
(Change Version) Optimized to not do repeated tests of tools for functions that are used more than one time. Added boolean tested flags, and global app path variables to handle this. this can knock off up to 10 or more type -p app exists type tests for one script execution.
2010-01-29 23:31:20 +00:00
if [[ -n $HDDTEMP_PATH && -n $1 ]];then
tweaked help and comments for the sudo information, it requires sudo -V 1.7 or newer to use -n option. If older, sudo will just error out, which is fine for now, it always works as root though. Eventually all systems will support this, so there's no real need to test for version numbers of sudo I think.
2009-08-03 04:32:29 +00:00
# only use sudo if not root, -n option requires sudo -V 1.7 or greater. sudo will just error out
# which is the safest course here for now, otherwise that interactive sudo password thing is too annoying
Added which sudo test, added more comments to explain what is happening.
2009-08-03 04:38:27 +00:00
# important: -n makes it non interactive, no prompt for password
(Change Version) Optimized to not do repeated tests of tools for functions that are used more than one time. Added boolean tested flags, and global app path variables to handle this. this can knock off up to 10 or more type -p app exists type tests for one script execution.
2010-01-29 23:31:20 +00:00
if [[ $B_ROOT != 'true' && -n $SUDO_PATH ]];then
(change version) small new feature: show with -x, extra options, hddtemp data for -D data, if hddtemp installed, and if user root, or if user is in /etc/sudoers with: <username> ALL = NOPASSWD: /usr/sbin/hddtemp Another nice little sys admin thing.
2009-08-03 03:57:20 +00:00
sudo_command='sudo -n '
fi
Added which sudo test, added more comments to explain what is happening.
2009-08-03 04:38:27 +00:00
# this will fail if regular user and no sudo present, but that's fine, it will just return null
(Change Version) Optimized to not do repeated tests of tools for functions that are used more than one time. Added boolean tested flags, and global app path variables to handle this. this can knock off up to 10 or more type -p app exists type tests for one script execution.
2010-01-29 23:31:20 +00:00
hdd_temp=$( eval $sudo_command $HDDTEMP_PATH -nq -u C $1 )
some fine tuning just in case hdd temp returns say 34.5
2011-06-06 21:04:15 +00:00
if [[ -n $hdd_temp && -n $( grep -E '^([0-9\.]+)$' <<< $hdd_temp ) ]];then
(change version) small new feature: show with -x, extra options, hddtemp data for -D data, if hddtemp installed, and if user root, or if user is in /etc/sudoers with: <username> ALL = NOPASSWD: /usr/sbin/hddtemp Another nice little sys admin thing.
2009-08-03 03:57:20 +00:00
echo $hdd_temp
fi
fi
added file system type for unmounted fs, if available. Uses file -s, can add it to sudoers if you want to run it as regular user.
2010-01-09 19:20:40 +00:00
eval $LOGFE
(change version) small new feature: show with -x, extra options, hddtemp data for -D data, if hddtemp installed, and if user root, or if user is in /etc/sudoers with: <username> ALL = NOPASSWD: /usr/sbin/hddtemp Another nice little sys admin thing.
2009-08-03 03:57:20 +00:00
}
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
get_init_data()
{
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local init_type='' init_version='' rc_type='' rc_version='' a_temp=''
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
local ls_run='' strings_init_version=''
local runlevel=$( get_runlevel_data )
local default_runlevel=$( get_runlevel_default )
# this test is pretty solid, if pid 1 is owned by systemd, it is systemd
# otherwise that is 'init', which covers the rest of the init systems, I think anyway.
# more data may be needed for other init systems.
if [[ -e /proc/1/comm && -n $( grep -s 'systemd' /proc/1/comm ) ]];then
init_type='systemd'
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p systemd &>/dev/null;then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
init_version=$( get_program_version 'systemd' '^systemd' '2' )
small bug fix for arch linux, added fallback test for systemd version
2014-03-13 00:45:53 +00:00
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if [[ -z $init_version ]];then
if type -p systemctl &>/dev/null;then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
init_version=$( get_program_version 'systemctl' '^systemd' '2' )
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
fi
small bug fix for arch linux, added fallback test for systemd version
2014-03-13 00:45:53 +00:00
fi
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
else
ls_run=$(ls /run)
# note: upstart-file-bridge.pid upstart-socket-bridge.pid upstart-udev-bridge.pid
small change in upstart detection, picked a more robust method
2014-03-13 00:34:39 +00:00
if [[ -n $( /sbin/init --version 2>/dev/null | grep 'upstart' ) ]];then
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
init_type='Upstart'
# /sbin/init --version == init (upstart 1.12.1)
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
init_version=$( get_program_version 'init' 'upstart' '3' )
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif type -p epoch &>/dev/null;then
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
init_type='Epoch'
# epoch version == Epoch Init System 1.0.1 "Sage"
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
init_version=$( get_program_version 'epoch' '^Epoch' '4' )
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
# missing data:
# http://smarden.org/runit/sv.8.html
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
elif [[ -e /sbin/runit-init || -e /etc/runit || -n $( type -p sv ) ]];then
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
init_type='runit' # lower case
# no data on version yet
elif [[ -f /etc/inittab ]];then
init_type='SysVinit'
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p strings &>/dev/null;then
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
strings_init_version="$( strings /sbin/init | grep -E 'version[[:space:]]+[0-9]' )"
fi
if [[ -n $strings_init_version ]];then
init_version=$( gawk '{print $2}' <<< "$strings_init_version" )
fi
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
# freebsd at least
elif [[ -f /etc/ttys ]];then
init_type='init (bsd)'
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
fi
if [[ -n $( grep 'openrc' <<< "$ls_run" ) ]];then
rc_type='OpenRC'
# /sbin/openrc --version == openrc (OpenRC) 0.13
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p openrc &>/dev/null;then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
rc_version=$( get_program_version 'openrc' '^openrc' '3' )
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
# /sbin/rc --version == rc (OpenRC) 0.11.8 (Gentoo Linux)
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif type -p rc &>/dev/null;then
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
rc_version=$( get_program_version 'rc' '^rc' '3' )
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
fi
## assume sysvrc, but this data is too buggy and weird and inconsistent to have meaning
# leaving this off for now
# elif [[ -f /etc/inittab ]];then
# rc_type='SysVrc'
# # this is a guess that rc and init are same versions, may need updates / fixes
# rc_version=$init_version
fi
fi
IFS=$'\n'
A_INIT_DATA=(
"$init_type"
"$init_version"
"$rc_type"
"$rc_version"
"$runlevel"
"$default_runlevel" )
IFS="$ORIGINAL_IFS"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_INIT_DATA[@]}
log_function_data "A_INIT_DATA: $a_temp"
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
eval $LOGFE
}
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
get_kernel_version()
{
eval $LOGFS
local kernel_version='' ksplice_kernel_version=''
kernel_version=$( uname -rm )
if [[ -n $( type -p uptrack-uname ) && -n $kernel_version ]];then
ksplice_kernel_version=$( uptrack-uname -rm )
if [[ $kernel_version != $ksplice_kernel_version ]];then
kernel_version="$ksplice_kernel_version (ksplice)"
fi
fi
log_function_data "kernel_version: $kernel_version - ksplice_kernel_version: $ksplice_kernel_version"
echo $kernel_version
eval $LOGFE
}
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
# args: $1 - v/n
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
get_lspci_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
local lspci_data=''
if [[ $B_LSPCI == 'true' ]];then
lspci_data="$( lspci -$1 | gawk '{
gsub(/\(prog-if[^)]*\)/,"")
sub(/^0000:/, "", $0) # seen case where the 0000: is prepended, rare, but happens
print
}' )"
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
echo "$lspci_data"
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
log_function_data 'raw' "lspci_data $1:\n$lspci_data"
eval $LOGFE
}
# args: $1 - busid
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
get_lspci_chip_id()
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
{
eval $LOGFS
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
local chip_id=''
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=$( gawk '
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
/^'$1'/ {
if ( $3 != "" ) {
print $3
}
}' <<< "$Lspci_n_Data" )
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
echo $chip_id
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
refactored and ordered get data functions
2008-10-30 05:04:11 +00:00
}
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
get_machine_data()
{
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local a_temp='' separator='' id_file='' file_data='' array_string=''
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
local id_dir='/sys/class/dmi/id/' dmi_data=''
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
local machine_files="
sys_vendor product_name product_version product_serial product_uuid
board_vendor board_name board_version board_serial
bios_vendor bios_version bios_date
"
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
user patch, added support, as root user, for dmidecode in -M data. This helps users of older systems get system machine data.
2012-03-26 21:41:53 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
machine_files="$machine_files
chassis_vendor chassis_type chassis_version chassis_serial
"
fi
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
if [[ -d $id_dir ]];then
for id_file in $machine_files
do
file_data=''
if [[ -r $id_dir$id_file ]];then
file_data=$( gawk '
BEGIN {
IGNORECASE=1
}
{
gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
simplified and moved filters to sub not gsub
2011-06-08 06:49:29 +00:00
gsub(/,/, " ", $0)
added more wifi detection filters
2011-06-09 01:51:46 +00:00
# yes, there is a typo in a user data set, unknow
improved regex detections for systme/mobo null data filters
2011-07-08 18:18:59 +00:00
# Base Board Version|Base Board Serial Number
# Chassis Manufacturer|Chassis Version|Chassis Serial Number
# System manufacturer|System Product Name|System Version
# To Be Filled By O.E.M.
added another regex for mobo data
2011-07-09 23:35:51 +00:00
sub(/^Base Board .*|^Chassis .*|.*O\.E\.M\..*|.*OEM.*|^Not .*|^System .*|.*unknow.*|.*N\/A.*|none|^To be filled.*/, "", $0)
added more filters
2011-06-08 17:46:25 +00:00
gsub(/bios|acpi/, "", $0)
fixes
2011-06-08 08:22:40 +00:00
sub(/http:\/\/www.abit.com.tw\//, "Abit", $0)
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
gsub(/^ +| +$/, "", $0)
gsub(/ [ \t]+/, " ", $0)
print $0
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' < $id_dir$id_file )
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
fi
array_string="$array_string$separator$file_data"
separator=','
done
user patch, added support, as root user, for dmidecode in -M data. This helps users of older systems get system machine data.
2012-03-26 21:41:53 +00:00
else
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
get_dmidecode_data
if [[ -n $DMIDECODE_DATA ]];then
user patch, added support, as root user, for dmidecode in -M data. This helps users of older systems get system machine data.
2012-03-26 21:41:53 +00:00
if [[ $B_ROOT == 'true' ]];then
fixed for older systems, -M with dmidecode can be empty, so error messages should also show that.
2012-03-26 22:17:27 +00:00
# this handles very old systems, like Lenny 2.6.26, with dmidecode, but no data
New tarball. Tiny fix for an obscure fringe case, leaving numbering as is. In some cases, dmidecode returns the grammatically wrong message: 'No smbios nor dmi data' instead of 'No smbios or dmi data', corrected the search to look for simpler: 'no smbios ' to avoid that random error.
2013-02-12 17:57:17 +00:00
if [[ -n $( grep -i 'no smbios ' <<< "$DMIDECODE_DATA" ) ]];then
fixed for older systems, -M with dmidecode can be empty, so error messages should also show that.
2012-03-26 22:17:27 +00:00
array_string='dmidecode-no-smbios-dmi-data'
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
# please note: only dmidecode version 2.11 or newer supports consistently the -s flag
fixed for older systems, -M with dmidecode can be empty, so error messages should also show that.
2012-03-26 22:17:27 +00:00
else
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
array_string=$( gawk -F ':' '
BEGIN {
IGNORECASE=1
baseboardManufacturer=""
baseboardProductName=""
baseboardSerialNumber=""
baseboardVersion=""
biosReleaseDate=""
biosRevision="" # only available from dmidecode
biosRomSize="" # only available from dmidecode
biosVendor=""
biosVersion=""
chassisManufacturer=""
chassisSerialNumber=""
chassisType=""
chassisVersion=""
systemManufacturer=""
systemProductName=""
systemVersion=""
systemSerialNumber=""
systemUuid=""
bItemFound="" # we will only output if at least one item was found
fullString=""
testString=""
bSys=""
bCha=""
bBio=""
bBas=""
}
/^Bios Information/ {
while ( getline && !/^$/ ) {
if ( $1 ~ /^Release Date/ ) { biosReleaseDate=$2 }
if ( $1 ~ /^BIOS Revision/ ) { biosRevision=$2 }
if ( $1 ~ /^ROM Size/ ) { biosRomSize=$2 }
if ( $1 ~ /^Vendor/ ) { biosVendor=$2 }
if ( $1 ~ /^Version/ ) { biosVersion=$2 }
}
testString=biosReleaseDate biosRevision biosRomSize biosVendor biosVersion
if ( testString != "" ) {
bItemFound="true"
}
bBio="true"
}
/^Base Board Information/ {
while ( getline && !/^$/ ) {
if ( $1 ~ /^Manufacturer/ ) { baseboardManufacturer=$2 }
if ( $1 ~ /^Product Name/ ) { baseboardProductName=$2 }
if ( $1 ~ /^Serial Number/ ) { baseboardSerialNumber=$2 }
}
testString=baseboardManufacturer baseboardProductName baseboardSerialNumber
if ( testString != "" ) {
bItemFound="true"
}
bBas="true"
}
/^Chassis Information/ {
while ( getline && !/^$/ ) {
if ( $1 ~ /^Manufacturer/ ) { chassisManufacturer=$2 }
if ( $1 ~ /^Serial Number/ ) { chassisSerialNumber=$2 }
if ( $1 ~ /^Type/ ) { chassisType=$2 }
if ( $1 ~ /^Version/ ) { chassisVersion=$2 }
}
testString=chassisManufacturer chassisSerialNumber chassisType chassisVersion
if ( testString != "" ) {
bItemFound="true"
}
bCha="true"
}
/^System Information/ {
while ( getline && !/^$/ ) {
if ( $1 ~ /^Manufacturer/ ) { systemManufacturer=$2 }
if ( $1 ~ /^Product Name/ ) { systemProductName=$2 }
if ( $1 ~ /^Version/ ) { systemVersion=$2 }
if ( $1 ~ /^Serial Number/ ) { systemSerialNumber=$2 }
if ( $1 ~ /^UUID/ ) { systemUuid=$2 }
}
testString=systemManufacturer systemProductName systemVersion systemSerialNumber systemUuid
if ( testString != "" ) {
bItemFound="true"
}
bSys="true"
}
( bSys == "true" && bCha="true" && bBio == "true" && bBas == "true" ) {
exit # stop the loop
}
END {
if ( bItemFound == "true" ) {
fullString = systemManufacturer "," systemProductName "," systemVersion "," systemSerialNumber
fullString = fullString "," systemUuid "," baseboardManufacturer "," baseboardProductName
fullString = fullString "," baseboardVersion "," baseboardSerialNumber "," biosVendor
fullString = fullString "," biosVersion "," biosReleaseDate "," chassisManufacturer
fullString = fullString "," chassisType "," chassisVersion "," chassisSerialNumber
fullString = fullString "," biosRevision "," biosRomSize
print fullString
}
}' <<< "$DMIDECODE_DATA" )
fixed for older systems, -M with dmidecode can be empty, so error messages should also show that.
2012-03-26 22:17:27 +00:00
fi
user patch, added support, as root user, for dmidecode in -M data. This helps users of older systems get system machine data.
2012-03-26 21:41:53 +00:00
else
array_string='dmidecode-non-root-user'
fi
fi
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
fi
bug fix
2011-06-08 03:31:07 +00:00
IFS=','
A_MACHINE_DATA=( $array_string )
IFS="$ORIGINAL_IFS"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_MACHINE_DATA[@]}
# echo ${a_temp[@]}
log_function_data "A_MACHINE_DATA: $a_temp"
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
eval $LOGFE
}
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
# B_ROOT='true';get_machine_data;exit
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
## return memory used/installed
refactored and ordered get data functions
2008-10-30 05:04:11 +00:00
get_memory_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
local memory='' memory_full=''
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
if [[ $B_MEMINFO_FILE == 'true' ]];then
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
memory=$( gawk '
/^MemTotal:/ {
tot = $2
}
/^(MemFree|Buffers|Cached):/ {
notused+=$2
}
END {
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
used = tot - notused
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
printf("%.1f/%.1fMB\n", used/1024, tot/1024)
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}' $FILE_MEMINFO )
log_function_data 'cat' "$FILE_MEMINFO"
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
elif [[ $B_SYSCTL == 'true' && -n $Sysctl_a_Data ]];then
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
local gawk_fs=': '
if [[ $BSD_VERSION == 'openbsd' ]];then
gawk_fs='='
fi
memory=$( grep -i 'mem' <<< "$Sysctl_a_Data" | gawk -F "$gawk_fs" '
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
BEGIN {
realMemory=""
freeMemory=""
}
# freebsd seems to use bytes here
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
/^hw.physmem/ {
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
gsub(/^[^0-9]+|[^0-9]+$/,"",$2)
realMemory = $2/1024
if ( freeMemory != "" ) {
exit
}
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
}
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
# But, it uses K here. Openbsd does not seem to have this item
# this can be either: Free Memory OR Free Memory Pages
$1 ~ /^Free Memory/ {
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
gsub(/[^0-9]/,"",$NF)
freeMemory = $NF
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
if ( realMemory != "" ) {
exit
}
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
}
END {
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
# hack: temp fix for openbsd: in case no free mem was detected but we have physmem
if ( freeMemory == "" && realMemory != "" ) {
printf("NA/%.1fMB\n", realMemory/1024)
}
else if ( freeMemory != "" && realMemory != "" ) {
used = realMemory - freeMemory
printf("%.1f/%.1fMB\n", used/1024, realMemory/1024)
}
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
}' )
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
fi
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
echo "$memory"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "memory: $memory"
eval $LOGFE
refactored and ordered get data functions
2008-10-30 05:04:11 +00:00
}
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
# process and return module version data
get_module_version_number()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
local module_version=''
(Change Version) Optimized to not do repeated tests of tools for functions that are used more than one time. Added boolean tested flags, and global app path variables to handle this. this can knock off up to 10 or more type -p app exists type tests for one script execution.
2010-01-29 23:31:20 +00:00
if [[ $B_MODINFO_TESTED != 'true' ]];then
B_MODINFO_TESTED='true'
MODINFO_PATH=$( type -p modinfo )
fi
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
(Change Version) Optimized to not do repeated tests of tools for functions that are used more than one time. Added boolean tested flags, and global app path variables to handle this. this can knock off up to 10 or more type -p app exists type tests for one script execution.
2010-01-29 23:31:20 +00:00
if [[ -n $MODINFO_PATH ]];then
module_version=$( $MODINFO_PATH $1 2>/dev/null | gawk '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
}
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
/^version/ {
gsub(/,/, " ", $2)
gsub(/^ +| +$/, "", $2)
gsub(/ [ \t]+/, " ", $2)
print $2
}
' )
fi
echo "$module_version"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "module_version: $module_version"
eval $LOGFE
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
}
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
## create array of network cards
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
get_networking_data()
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local B_USB_NETWORKING='false' a_temp=''
tweaked it to add driver data also if usb was found for networking, that way it doesn't always run. New version number
2011-04-30 08:28:58 +00:00
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
IFS=$'\n'
new version: bug fix A case where pcibusid includes the pre- 0000: appeared, that broke the -N pcibus id handling for -n, which made for no output. Now inxi will just slice off that in the initial lspci creator.
2011-06-24 17:22:40 +00:00
A_NETWORK_DATA=( $(
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
echo "$Lspci_v_Data" | gawk '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
counter=0 # required to handle cases of > 1 instance of the same chipset
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
/^[0-9a-f:\.]+ (ethernet|network) (controller|bridge)/ || /^[0-9a-f:\.]+ [^:]+: .*(ethernet|network).*$/ {
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
nic=gensub(/^[0-9a-f:\.]+ [^:]+: (.+)$/,"\\1","g",$0)
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
#gsub(/realtek semiconductor/, "Realtek", nic)
#gsub(/davicom semiconductor/, "Davicom", nic)
some last cleanup of code
2008-11-06 23:08:34 +00:00
# The doublequotes are necessary because of the pipes in the variable.
Corrected misnamed cpu/normal ban lists, no longer calling working lists A_...
2008-11-06 19:59:58 +00:00
gsub(/'"$BAN_LIST_NORMAL"'/, "", nic)
Got rid of sanitize_data feature, which forces double dips into awk, instead I put hte cleaners for , and whitespace into each awk statement. This avoids exiting awk, then looping through the array in bash, then sending the array items to the cleaner function, back into awk, then sending it back, and rebuilding the array. I tried putting the gawk cleaners into a variable and using the variable, but that didn't work as expected, but I'll see if i can figure out how to get that working.
2008-11-06 20:32:19 +00:00
gsub(/,/, " ", nic)
gsub(/^ +| +$/, "", nic)
gsub(/ [ \t]+/, " ", nic)
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
# construct a unique string ending for each chipset detected, this allows for
# multiple instances of the same exact chipsets, ie, dual gigabit
nic = nic "~~" counter++
aPciBusId[nic] = gensub(/(^[0-9a-f:\.]+) [^:]+: .+$/,"\\1","g",$0)
# I do not understand why incrementing a string index makes sense?
eth[nic]++
while ( getline && !/^$/ ) {
(Change Version) fixed another small bug that made the print for busid use wrong data, forgot to clean , from original array data.
2010-02-05 23:04:02 +00:00
gsub(/,/, "", $0)
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
if ( /I\/O/ ) {
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
ports[nic] = ports[nic] $4 " "
}
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
if ( /driver in use/ ) {
(Change Version) fixed another small bug that made the print for busid use wrong data, forgot to clean , from original array data.
2010-02-05 23:04:02 +00:00
drivers[nic] = drivers[nic] gensub( /(.*): (.*)/ ,"\\2" ,"g" ,$0 ) ""
Got rid of sanitize_data feature, which forces double dips into awk, instead I put hte cleaners for , and whitespace into each awk statement. This avoids exiting awk, then looping through the array in bash, then sending the array items to the cleaner function, back into awk, then sending it back, and rebuilding the array. I tried putting the gawk cleaners into a variable and using the variable, but that didn't work as expected, but I'll see if i can figure out how to get that working.
2008-11-06 20:32:19 +00:00
}
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
else if ( /kernel modules/ ) {
(Change Version) fixed another small bug that made the print for busid use wrong data, forgot to clean , from original array data.
2010-02-05 23:04:02 +00:00
modules[nic] = modules[nic] gensub( /(.*): (.*)/ ,"\\2" ,"g" ,$0 ) ""
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
}
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
}
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
END {
j=0
for (i in eth) {
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
useDrivers=""
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
usePorts=""
useModules=""
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
usePciBusId=""
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
if ( eth[i] > 1 ) {
a[j] = eth[i] "x " i
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
}
else {
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
a[j] = i
}
## note: this loses the plural ports case, is it needed anyway?
if ( ports[i] != "" ) {
usePorts = ports[i]
}
if ( drivers[i] != "" ) {
useDrivers = drivers[i]
}
if ( modules[i] != "" ) {
useModules = modules[i]
}
if ( aPciBusId[i] != "" ) {
usePciBusId = aPciBusId[i]
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
}
Finally figured out how those weird pseud multilevel arrays work, tried it with networking, and it's working, I can get output for each line as an array of an array, so I can print and handle output better now.
2008-11-04 02:14:12 +00:00
# create array primary item for master array
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
# and strip out the counter again, this handled dual cards with same chipset
sub( /~~[0-9]+$/, "", a[j] )
cleaned up small trailing whitespace issue with ports output, put the cleanup where it belongs, in the data get function
2010-02-05 22:42:31 +00:00
sub( / $/, "", usePorts ) # clean off trailing whitespace
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
print a[j] "," useDrivers "," usePorts "," useModules, "," usePciBusId
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
j++
}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' ) )
Fixed broken cache output, fixed bogomips output, created new cpu data function that takes core count and data number and creates correct value for all cores total
2008-11-03 22:37:57 +00:00
IFS="$ORIGINAL_IFS"
bug fix, first patch, usb networking wasn't working, not sure why this was never reported
2011-11-22 06:31:28 +00:00
get_networking_usb_data
if [[ $B_SHOW_ADVANCED_NETWORK == 'true' || $B_USB_NETWORKING == 'true' ]];then
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
get_network_advanced_data
tweaked it to add driver data also if usb was found for networking, that way it doesn't always run. New version number
2011-04-30 08:28:58 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_NETWORK_DATA[@]}
log_function_data "A_NETWORK_DATA: $a_temp"
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
eval $LOGFE
}
get_network_advanced_data()
{
eval $LOGFS
found another path case for usb networking cards, requires special handling
2011-06-06 03:54:28 +00:00
local a_network_adv_working='' if_path='' working_path='' working_uevent_path='' dir_path=''
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
local if_id='' speed='' duplex='' mac_id='' oper_state='' chip_id=''
new version, with usb networking driver output now
2011-04-30 08:06:01 +00:00
local usb_data='' usb_vendor='' usb_product='' product_path='' driver_test=''
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
for (( i=0; i < ${#A_NETWORK_DATA[@]}; i++ ))
do
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
IFS=","
a_network_adv_working=( ${A_NETWORK_DATA[i]} )
# reset these every go round
small glitch fix
2011-04-30 08:37:05 +00:00
driver_test=''
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
if_id=''
speed=''
duplex=''
mac_id=''
oper_state=''
a bit of optimizing
2011-04-30 08:40:40 +00:00
usb_data=''
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=''
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
if [[ -z $( grep '^usb-' <<< ${a_network_adv_working[4]} ) ]];then
removed -v from lsusb audio, it's not needed and may be triggering kernel issues for some users.
2011-06-23 02:42:48 +00:00
# note although this may exist technically don't use it, it's a virtual path
# and causes weird cat errors when there's a missing file as well as a virtual path
# /sys/bus/pci/devices/0000:02:02.0/net/eth1
initial bug fix, but just a workaround for error triggered cat of /sys files
2011-06-23 03:04:01 +00:00
# real paths are: /sys/devices/pci0000:00/0000:00:1e/0/0000:02:02.0/net/eth1/uevent
# and on older debian kernels: /sys/devices/pci0000:00/0000:02:02.0/net:eth1/uevent
trying a bug fix for broadcom id
2011-11-22 03:54:40 +00:00
# but broadcom shows this sometimes:
# /sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/ssb0:0/uevent:['DRIVER=b43', 'MODALIAS=ssb:v4243id0812rev0D']:
hot bug fix, removed debuggers
2011-06-23 02:51:16 +00:00
working_path="/sys/bus/pci/devices/0000:${a_network_adv_working[4]}"
using readlink to provide true path now for -n advanced data
2011-06-23 03:12:47 +00:00
# now we want the real one, that xiin also displays, without symbolic links.
if [[ -e $working_path ]];then
working_path=$( readlink -f $working_path 2>/dev/null )
bug fix
2011-11-22 04:00:28 +00:00
# sometimes there is another directory between the path and /net
if [[ ! -e $working_path/net ]];then
# using find here, probably will need to also use it in usb part since the grep
# method seems to not be working now. Slice off the rest, which leaves the basic path
bug fix
2011-11-22 04:11:43 +00:00
working_path=$( find $working_path/*/net/*/uevent 2>/dev/null | \
sed 's|/net.*||' )
bug fix
2011-11-22 04:00:28 +00:00
fi
using readlink to provide true path now for -n advanced data
2011-06-23 03:12:47 +00:00
fi
hot bug fix, removed debuggers
2011-06-23 02:51:16 +00:00
# working_path=$( ls /sys/devices/pci*/*/0000:${a_network_adv_working[4]}/net/*/uevent )
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
else
bug fix, advanced -n
2012-10-19 05:55:09 +00:00
# now we'll use the actual vendor:product string instead
usb_data=${a_network_adv_working[10]}
bug fix
2011-04-30 06:28:22 +00:00
usb_vendor=$( cut -d ':' -f 1 <<< $usb_data )
usb_product=$( cut -d ':' -f 2 <<< $usb_data )
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
# this grep returns the path plus the contents of the file, with a colon separator, so slice that off
tweaks
2011-04-30 06:14:39 +00:00
# /sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.1/idVendor
cleaned up code a bit
2011-04-30 19:14:27 +00:00
working_path=$( grep -s "$usb_vendor" /sys/devices/pci*/*/usb*/*/*/idVendor | \
sed -e "s/idVendor:$usb_vendor//" -e '/driver/d' )
debugging, had to add alternate case for idVendor path
2011-04-30 19:08:21 +00:00
# try an alternate path if first one doesn't work
# /sys/devices/pci0000:00/0000:00:0b.1/usb1/1-1/idVendor
if [[ -z $working_path ]];then
cleaned up code a bit
2011-04-30 19:14:27 +00:00
working_path=$( grep -s "$usb_vendor" /sys/devices/pci*/*/usb*/*/idVendor | \
sed -e "s/idVendor:$usb_vendor//" -e '/driver/d' )
product_path=$( grep -s "$usb_product" /sys/devices/pci*/*/usb*/*/idProduct | \
sed -e "s/idProduct:$usb_product//" -e '/driver/d' )
debugging, had to add alternate case for idVendor path
2011-04-30 19:08:21 +00:00
else
cleaned up code a bit
2011-04-30 19:14:27 +00:00
product_path=$( grep -s "$usb_product" /sys/devices/pci*/*/usb*/*/*/idProduct | \
sed -e "s/idProduct:$usb_product//" -e '/driver/d' )
debugging, had to add alternate case for idVendor path
2011-04-30 19:08:21 +00:00
fi
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
# make sure it's the right product/vendor match here, it will almost always be but let's be sure
add back in test
2011-04-30 06:29:23 +00:00
if [[ -n $working_path && -n $product_path ]] && [[ $working_path == $product_path ]];then
#if [[ -n $working_path ]];then
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
# now ls that directory and get the numeric starting sub directory and that should be the full path
# to the /net directory part
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
dir_path=$( ls $working_path 2>/dev/null | grep -sE '^[0-9]' )
working_uevent_path="$working_path$dir_path"
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
fi
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
fi
maybe driver for usb card?
2011-04-30 08:00:49 +00:00
# /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2:1.0/uevent grep for DRIVER=
added a lot of possible network id strings, we'll see how it goes
2011-04-30 22:16:41 +00:00
# /sys/devices/pci0000:00/0000:00:0b.1/usb1/1-1/1-1:1.0/uevent
a bit of optimizing
2011-04-30 08:40:40 +00:00
if [[ -n $usb_data ]];then
found another path case for usb networking cards, requires special handling
2011-06-06 03:54:28 +00:00
driver_test=$( grep -si 'DRIVER=' $working_uevent_path/uevent | cut -d '=' -f 2 )
a bit of optimizing
2011-04-30 08:40:40 +00:00
if [[ -n $driver_test ]];then
a_network_adv_working[1]=$driver_test
fi
maybe driver for usb card?
2011-04-30 08:00:49 +00:00
fi
debugger added
2011-06-06 04:35:17 +00:00
log_function_data "PRE: working_path: $working_path\nworking_uevent_path: $working_uevent_path"
bug fixes, and upped version number. Yes, fixing one bug caused another, hopefully both are now fixed
2011-06-06 05:01:14 +00:00
# this applies in two different cases, one, default, standard, two, for usb, this is actually
# the short path, minus the last longer numeric directory name, ie:
# from debian squeeze 2.6.32-5-686:
found another path case for usb networking cards, requires special handling
2011-06-06 03:54:28 +00:00
# /sys/devices/pci0000:00/0000:00:0b.1/usb1/1-1/net/wlan0/address
bug fixes, and upped version number. Yes, fixing one bug caused another, hopefully both are now fixed
2011-06-06 05:01:14 +00:00
if [[ -e $working_path/net ]];then
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
if_path=$( ls $working_path/net 2>/dev/null )
if_id=$if_path
working_path=$working_path/net/$if_path
bug fixes, and upped version number. Yes, fixing one bug caused another, hopefully both are now fixed
2011-06-06 05:01:14 +00:00
# this is the normal usb detection if the first one didn't work
elif [[ -n $usb_data && -e $working_uevent_path/net ]];then
if_path=$( ls $working_uevent_path/net 2>/dev/null )
if_id=$if_path
working_path=$working_uevent_path/net/$if_path
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
# 2.6.32 debian lenny kernel shows not: /net/eth0 but /net:eth0
else
bug fixes
2011-06-06 04:42:18 +00:00
if_path=$( ls $working_path 2>/dev/null | grep 'net:' )
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
if_id=$( cut -d ':' -f 2 <<< "$if_path" )
bug fixes
2011-06-06 04:42:18 +00:00
working_path=$working_path/$if_path
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
fi
debugger added
2011-06-06 04:35:17 +00:00
log_function_data "POST: working_path: $working_path\nif_path: $if_path - if_id: $if_id"
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
if [[ -n $if_path ]];then
initial bug fix, but just a workaround for error triggered cat of /sys files
2011-06-23 03:04:01 +00:00
if [[ -r $working_path/speed ]];then
speed=$( cat $working_path/speed 2>/dev/null )
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
fi
initial bug fix, but just a workaround for error triggered cat of /sys files
2011-06-23 03:04:01 +00:00
if [[ -r $working_path/duplex ]];then
duplex=$( cat $working_path/duplex 2>/dev/null )
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
fi
initial bug fix, but just a workaround for error triggered cat of /sys files
2011-06-23 03:04:01 +00:00
if [[ -r $working_path/address ]];then
mac_id=$( cat $working_path/address 2>/dev/null )
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
fi
initial bug fix, but just a workaround for error triggered cat of /sys files
2011-06-23 03:04:01 +00:00
if [[ -r $working_path/operstate ]];then
oper_state=$( cat $working_path/operstate 2>/dev/null )
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
fi
fi
bug fix
2012-10-19 05:43:37 +00:00
if [[ -n ${a_network_adv_working[10]} ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=${a_network_adv_working[10]}
bug fix
2012-10-19 05:43:37 +00:00
fi
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
A_NETWORK_DATA[i]=${a_network_adv_working[0]}","${a_network_adv_working[1]}","${a_network_adv_working[2]}","${a_network_adv_working[3]}","${a_network_adv_working[4]}","$if_id","$oper_state","$speed","$duplex","$mac_id","$chip_id
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
IFS="$ORIGINAL_IFS"
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
done
debugger added
2011-06-06 04:35:17 +00:00
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
}
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
get_networking_usb_data()
{
eval $LOGFS
bug fix, first patch, usb networking wasn't working, not sure why this was never reported
2011-11-22 06:31:28 +00:00
local lsusb_path='' lsusb_data='' a_usb='' array_count=''
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
# now we'll check for usb wifi, a work in progress
# USB_NETWORK_SEARCH
# alsa usb detection by damentz
# for every sound card symlink in /proc/asound - display information about it
lsusb_path=$( type -p lsusb )
# if lsusb exists, the file is a symlink, and contains an important usb exclusive file: continue
if [[ -n $lsusb_path ]]; then
# send error messages of lsusb to /dev/null as it will display a bunch if not a super user
lsusb_data="$( $lsusb_path 2>/dev/null )"
# also, find the contents of usbid in lsusb and print everything after the 7th word on the
# corresponding line. Finally, strip out commas as they will change the driver :)
if [[ -n $lsusb_data ]];then
IFS=$'\n'
a_usb=( $(
gawk '
BEGIN {
IGNORECASE=1
string=""
separator=""
}
/'"$USB_NETWORK_SEARCH"'/ && !/bluetooth| hub|keyboard|mouse|printer| ps2|reader|scan|storage/ {
string=""
gsub( /,/, " ", $0 )
gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
gsub(/ [ \t]+/, " ", $0)
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
#sub(/realtek semiconductor/, "Realtek", $0)
#sub(/davicom semiconductor/, "Davicom", $0)
#sub(/Belkin Components/, "Belkin", $0)
bug fixes
2012-10-19 03:37:30 +00:00
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
for ( i=7; i<= NF; i++ ) {
string = string separator $i
separator = " "
}
fixed an old bug in networking, usb, that puts the vendor:product id instead of the bus id for usb, some other changes coming so no version change yet.
2012-10-19 03:23:21 +00:00
if ( $2 != "" ){
bug fixes
2012-10-19 03:37:30 +00:00
sub(/:/, "", $4 )
bug fix
2012-10-19 05:43:37 +00:00
print string ",,,,usb-" $2 "-" $4 ",,,,,," $6
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' <<< "$lsusb_data" ) )
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
IFS="$ORIGINAL_IFS"
if [[ ${#a_usb[@]} -gt 0 ]];then
array_count=${#A_NETWORK_DATA[@]}
for (( i=0; i < ${#a_usb[@]}; i++ ))
do
A_NETWORK_DATA[$array_count]=${a_usb[i]}
((array_count++))
done
# need this to get the driver data for -N regular output, but no need
# to run the advanced stuff unless required
bug fix, first patch, usb networking wasn't working, not sure why this was never reported
2011-11-22 06:31:28 +00:00
B_USB_NETWORKING='true'
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
fi
fi
fi
bug fix, first patch, usb networking wasn't working, not sure why this was never reported
2011-11-22 06:31:28 +00:00
# echo $B_USB_NETWORKING
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
eval $LOGFE
}
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
get_networking_wan_ip_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
local ip=''
added feature where a different ip page can be added by whoever. That would need to be set in the inxi override config file. The page must show only one line of output, and that last item on that line must be the ip address. Ok, that's it, not a big deal, but some people may prefer a non smxi ip address page for whatever reason, so have at it. Or not.
2012-04-16 18:06:13 +00:00
# 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
# to handle ipv4 and ipv6 addresses but should not be necessary.
adding in validation since user set ip addresses can be wrong. It's always something, sigh...
2012-04-16 20:29:13 +00:00
# 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=$( wget -q -O - $WAN_IP_URL | gawk --re-interval '
new tarball, version, bug fixes on weather, also optimized speed for slow isps, and added a global that can be set in user / system configs to make a longer wget time out. Default is 8 seconds. This should take care of the failure from slow load issue reported.
2013-05-18 05:14:27 +00:00
ip=$( wget -t 1 -T $WGET_TIMEOUT -q -O - $WAN_IP_URL | gawk --re-interval '
adding in validation since user set ip addresses can be wrong. It's always something, sigh...
2012-04-16 20:29:13 +00:00
{
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
#gsub("\n","",$2")
added feature where a different ip page can be added by whoever. That would need to be set in the inxi override config file. The page must show only one line of output, and that last item on that line must be the ip address. Ok, that's it, not a big deal, but some people may prefer a non smxi ip address page for whatever reason, so have at it. Or not.
2012-04-16 18:06:13 +00:00
print $NF
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
}' )
adding in validation since user set ip addresses can be wrong. It's always something, sigh...
2012-04-16 20:29:13 +00:00
# validate the data
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
if [[ -z $ip ]];then
ip='None Detected!'
adding in validation since user set ip addresses can be wrong. It's always something, sigh...
2012-04-16 20:29:13 +00:00
elif [[ -z $( grep -Es \
'^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}|[[:alnum:]]{0,4}:[[:alnum:]]{0,4}:[[:alnum:]]{0,4}:[[:alnum:]]{0,4}:[[:alnum:]]{0,4}:[[:alnum:]]{0,4}:[[:alnum:]]{0,4}:[[:alnum:]]{0,4})$' <<< $ip ) ]];then
ip='IP Source Corrupt!'
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
fi
echo "$ip"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "ip: $ip"
eval $LOGFE
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
}
get_networking_local_ip_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
local ip_tool_command=$( type -p ip )
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local a_temp='' ip_tool='ip' ip_tool_data=''
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
# the chances for all new systems to have ip by default are far higher than
# the deprecated ifconfig. Only try for ifconfig if ip is not present in system
if [[ -z $ip_tool_command ]];then
ip_tool_command=$( type -p ifconfig )
ip_tool='ifconfig'
else
ip_tool_command="$ip_tool_command addr"
fi
if [[ -n "$ip_tool_command" ]];then
major fix for ip addr output, handled weak cases, now it inserts a newline before each record item with sed to create discrete records for gawk to parse easily. this solves the problem exposed when there is no ipv6 output, and thus the last line used to test for end of record was vanished. now it's all just treated like ifconfig except a few small differences of which item to slice out.
2011-06-25 01:17:16 +00:00
if [[ $ip_tool == 'ifconfig' ]];then
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
ip_tool_data="$( $ip_tool_command | gawk '
{
line=gensub(/^([a-z]+[0-9][:]?[[:space:]].*)/, "\n\\1", $0)
print line
}' )"
major fix for ip addr output, handled weak cases, now it inserts a newline before each record item with sed to create discrete records for gawk to parse easily. this solves the problem exposed when there is no ipv6 output, and thus the last line used to test for end of record was vanished. now it's all just treated like ifconfig except a few small differences of which item to slice out.
2011-06-25 01:17:16 +00:00
# note, ip addr does not have proper record separation, so creating new lines explicitly here at start
# of each IF record item. Also getting rid of the unneeded numeric line starters, now it can be parsed
# like ifconfig more or less
elif [[ $ip_tool == 'ip' ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
ip_tool_data="$( eval $ip_tool_command | sed 's/^[0-9]\+:[[:space:]]\+/\n/' )"
major fix for ip addr output, handled weak cases, now it inserts a newline before each record item with sed to create discrete records for gawk to parse easily. this solves the problem exposed when there is no ipv6 output, and thus the last line used to test for end of record was vanished. now it's all just treated like ifconfig except a few small differences of which item to slice out.
2011-06-25 01:17:16 +00:00
fi
fi
if [[ -z $ip_tool_command ]];then
A_INTERFACES_DATA=( "Interfaces program 'ip' missing. Please check: $SCRIPT_NAME --recommends" )
elif [[ -n "$ip_tool_data" ]];then
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
IFS=$'\n' # $ip_tool_command
A_INTERFACES_DATA=( $(
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
gawk -v ipTool=$ip_tool -v bsdType=$BSD_TYPE '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
interface=""
ifIp=""
ifIpV6=""
ifMask=""
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
# skip past the lo item
major fix for ip addr output, handled weak cases, now it inserts a newline before each record item with sed to create discrete records for gawk to parse easily. this solves the problem exposed when there is no ipv6 output, and thus the last line used to test for end of record was vanished. now it's all just treated like ifconfig except a few small differences of which item to slice out.
2011-06-25 01:17:16 +00:00
/^lo/ {
while (getline && !/^$/ ) {
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
# do nothing, just get past this entry item
}
}
major fix for ip addr output, handled weak cases, now it inserts a newline before each record item with sed to create discrete records for gawk to parse easily. this solves the problem exposed when there is no ipv6 output, and thus the last line used to test for end of record was vanished. now it's all just treated like ifconfig except a few small differences of which item to slice out.
2011-06-25 01:17:16 +00:00
/^[a-zA-Z]+[0-9]/ {
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
# not clear on why inet is coming through, but this gets rid of it
# as first line item.
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
gsub(/,/, " ", $0)
gsub(/^ +| +$/, "", $0)
gsub(/ [ \t]+/, " ", $0)
major fix for ip addr output, handled weak cases, now it inserts a newline before each record item with sed to create discrete records for gawk to parse easily. this solves the problem exposed when there is no ipv6 output, and thus the last line used to test for end of record was vanished. now it's all just treated like ifconfig except a few small differences of which item to slice out.
2011-06-25 01:17:16 +00:00
interface = $1
# prep this this for ip addr: eth0:
sub(/:/, "", interface)
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
ifIp=""
ifIpV6=""
ifMask=""
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
aInterfaces[interface]++
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
major fix for ip addr output, handled weak cases, now it inserts a newline before each record item with sed to create discrete records for gawk to parse easily. this solves the problem exposed when there is no ipv6 output, and thus the last line used to test for end of record was vanished. now it's all just treated like ifconfig except a few small differences of which item to slice out.
2011-06-25 01:17:16 +00:00
while (getline && !/^$/ ) {
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
if ( ipTool == "ifconfig" ) {
if (/inet addr:/) {
ifIp = gensub( /addr:([0-9\.]+)/, "\\1", "g", $2 )
if (/mask:/) {
ifMask = gensub( /mask:([0-9\.]+)/, "\\1", "g", $NF )
}
}
if (/inet6 addr:/) {
ifIpV6 = $3
}
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
if ( bsdType == "bsd" ) {
if ( $1 == "inet" ) {
ifIp = $2
if ( $3 == "netmask" ) {
ifMask = $4
}
}
if ( $0 ~ /inet6.*%/ ) {
sub(/%.*/,"",$2)
ifIpV6 = $2
}
}
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
}
else if ( ipTool == "ip" ) {
if ( $1 == "inet" ) {
ifIp = $2
}
if ( $1 == "inet6" ) {
ifIpV6 = $2
}
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
}
}
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
# slice off the digits that are sometimes tacked to the end of the address,
# like: /64 or /24
sub(/\/[0-9]+/, "", ifIp)
sub(/\/[0-9]+/, "", ifIpV6)
ipAddresses[interface] = ifIp "," ifMask "," ifIpV6
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
}
END {
j=0
for (i in aInterfaces) {
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
ifData = ""
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
a[j] = i
if (ipAddresses[i] != "") {
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
ifData = ipAddresses[i]
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
}
# create array primary item for master array
# tested needed to avoid bad data from above, if null it is garbage
# this is the easiest way to handle junk I found, improve if you want
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
if ( ifData != "" ) {
print a[j] "," ifData
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
}
j++
}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' <<< "$ip_tool_data" ) )
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
IFS="$ORIGINAL_IFS"
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
else
major fix for ip addr output, handled weak cases, now it inserts a newline before each record item with sed to create discrete records for gawk to parse easily. this solves the problem exposed when there is no ipv6 output, and thus the last line used to test for end of record was vanished. now it's all just treated like ifconfig except a few small differences of which item to slice out.
2011-06-25 01:17:16 +00:00
A_INTERFACES_DATA=( "Interfaces program $ip_tool present but created no data. " )
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_INTERFACES_DATA[@]}
log_function_data "A_INTERFACES_DATA: $a_temp"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
}
major fix for ip addr output, handled weak cases, now it inserts a newline before each record item with sed to create discrete records for gawk to parse easily. this solves the problem exposed when there is no ipv6 output, and thus the last line used to test for end of record was vanished. now it's all just treated like ifconfig except a few small differences of which item to slice out.
2011-06-25 01:17:16 +00:00
# get_networking_local_ip_data;exit
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
# get_networking_local_ip_data;exit
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
get_optical_drive_data()
{
eval $LOGFS
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local a_temp='' sys_uevent_path='' proc_cdrom='' link_list=''
local separator='' linked='' working_disk='' disk='' item_string='' proc_info_string=''
local dev_disks_full="$( ls /dev/dvd* /dev/cd* /dev/scd* /dev/sr* 2>/dev/null )"
## Not using this now because newer kernel is NOT linking all optical drives. Some, but not all
# Some systems don't support xargs -L plus the unlinked optical drive unit make this not a good option
version upgrade some optimizations, code fixes, handled failed xargs -l case for optical disks
2011-06-18 19:27:41 +00:00
# get the actual disk dev location, first try default which is easier to run, need to preserve line breaks
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# local dev_disks_real="$( echo "$dev_disks_full" | xargs -L 1 readlink 2>/dev/null | sort -u )"
#echo ddl: $dev_disks_full
for working_disk in $dev_disks_full
do
disk=$( readlink $working_disk 2>/dev/null )
if [[ -z $disk ]];then
disk=$working_disk
fi
disk=${disk##*/} # puppy shows this as /dev/sr0, not sr0
# if [[ -z $dev_disks_real || -z $( grep $disk <<< $dev_disks_real ) ]];then
bsd bash doesn't like the *"value"* bash test, so had to remove it.
2014-03-17 04:13:32 +00:00
if [[ -n $disk && -z $( grep "$disk" <<< $dev_disks_real ) ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# need line break IFS for below, no white space
dev_disks_real="$dev_disks_real$separator$disk"
separator=$'\n'
#separator=' '
fi
done
dev_disks_real="$( sort -u <<< "$dev_disks_real" )"
working_disk=''
disk=''
separator=''
#echo ddr: $dev_disks_real
replaced xargs -l with a for loop, sigh...
2011-06-18 18:49:42 +00:00
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
# A_OPTICAL_DRIVE_DATA indexes: not going to use all these, but it's just as easy to build the full
# data array and use what we need from it as to update it later to add features or items
# 0 - true dev path, ie, sr0, hdc
# 1 - dev links to true path
# 2 - device vendor - for hdx drives, vendor model are one string from proc
# 3 - device model
# 4 - device rev version
# 5 - speed
# 6 - multisession support
# 7 - MCN support
# 8 - audio read
# 9 - cdr
# 10 - cdrw
# 11 - dvd read
# 12 - dvdr
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
# 13 - dvdram
# 14 - state
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
if [[ -n $dev_disks_real ]];then
fixed a bug
2011-06-18 03:49:53 +00:00
if [[ $B_SHOW_FULL_OPTICAL == 'true' ]];then
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
proc_cdrom="$( cat /proc/sys/dev/cdrom/info 2>/dev/null )"
fi
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
IFS=$'\n'
A_OPTICAL_DRIVE_DATA=( $(
for disk in $dev_disks_real
do
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
for working_disk in $dev_disks_full
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
do
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ -n $( readlink $working_disk | grep $disk ) ]];then
linked=${working_disk##*/}
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
link_list="$link_list$separator$linked"
separator='~'
fi
done
item_string="$disk,$link_list"
link_list=''
patch, some optimizations and code cleanup
2011-06-18 18:37:02 +00:00
linked=''
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
separator=''
vendor=''
model=''
variable name fix0
2011-06-18 05:42:29 +00:00
proc_info_string=''
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
rev_number=''
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
state=""
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
sys_path=''
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
working_disk=''
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
# this is only for new sd type paths in /sys, otherwise we'll use /proc/ide
if [[ -z $( grep '^hd' <<< $disk ) ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# maybe newer kernels use this, not enough data.
sys_path=$( ls /sys/devices/pci*/*/ata*/host*/target*/*/block/$disk/uevent 2>/dev/null | sed "s|/block/$disk/uevent||" )
# maybe older kernels, this used to work (2014-03-16)
if [[ -z $sys_path ]];then
sys_path=$( ls /sys/devices/pci*/*/host*/target*/*/block/$disk/uevent 2>/dev/null | sed "s|/block/$disk/uevent||" )
fi
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
# no need to test for errors yet, probably other user systems will require some alternate paths though
if [[ -n $sys_path ]];then
patch, some optimizations and code cleanup
2011-06-18 18:37:02 +00:00
vendor=$( cat $sys_path/vendor 2>/dev/null )
cleanup
2011-06-18 01:22:03 +00:00
model=$( cat $sys_path/model 2>/dev/null | sed 's/^[[:space:]]*//;s/[[:space:]]*$//;s/,//g' )
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
state=$( cat $sys_path/state 2>/dev/null | sed 's/^[[:space:]]*//;s/[[:space:]]*$//;s/,//g' )
cleanup
2011-06-18 01:22:03 +00:00
rev_number=$( cat $sys_path/rev 2>/dev/null | sed 's/^[[:space:]]*//;s/[[:space:]]*$//;s/,//g' )
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
fi
elif [[ -e /proc/ide/$disk/model ]];then
patch, some optimizations and code cleanup
2011-06-18 18:37:02 +00:00
vendor=$( cat /proc/ide/$disk/model 2>/dev/null )
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
fi
handling of tsst corp string
2011-06-18 02:59:58 +00:00
if [[ -n $vendor ]];then
vendor=$( gawk '
BEGIN {
IGNORECASE=1
}
{
gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
sub(/TSSTcorp/, "TSST ", $0) # seen more than one of these weird ones
patch, some optimizations and code cleanup
2011-06-18 18:37:02 +00:00
gsub(/,/, " ", $0)
gsub(/^[[:space:]]*|[[:space:]]*$/, "", $0)
gsub(/ [[:space:]]+/, " ", $0)
handling of tsst corp string
2011-06-18 02:59:58 +00:00
print $0
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' <<< $vendor )
handling of tsst corp string
2011-06-18 02:59:58 +00:00
fi
first finalizing version
2011-06-18 03:17:05 +00:00
# this needs to run no matter if there's proc data or not to create the array comma list
fixed a bug
2011-06-18 03:49:53 +00:00
if [[ $B_SHOW_FULL_OPTICAL == 'true' ]];then
variable name fix0
2011-06-18 05:42:29 +00:00
proc_info_string=$( gawk -v diskId=$disk '
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
BEGIN {
IGNORECASE=1
position=""
speed=""
multisession=""
mcn=""
audio=""
cdr=""
cdrw=""
dvd=""
dvdr=""
dvdram=""
}
# first get the position of the device name from top field
# we will use this to get all the other data for that column
/drive name:/ {
for ( position=3; position <= NF; position++ ) {
if ( $position == diskId ) {
break
}
}
}
/drive speed:/ {
speed = $position
}
/Can read multisession:/ {
multisession=$( position + 1 )
}
/Can read MCN:/ {
mcn=$( position + 1 )
}
/Can play audio:/ {
audio=$( position + 1 )
}
/Can write CD-R:/ {
cdr=$( position + 1 )
}
/Can write CD-RW:/ {
cdrw=$( position + 1 )
}
/Can read DVD:/ {
dvd=$( position + 1 )
}
/Can write DVD-R:/ {
dvdr=$( position + 1 )
}
/Can write DVD-RAM:/ {
dvdram=$( position + 1 )
}
END {
print speed "," multisession "," mcn "," audio "," cdr "," cdrw "," dvd "," dvdr "," dvdram
}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
' <<< "$proc_cdrom" )
patch 5, more fixes
2011-06-18 00:52:38 +00:00
fi
variable name fix0
2011-06-18 05:42:29 +00:00
item_string="$item_string,$vendor,$model,$rev_number,$proc_info_string,$state"
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
echo $item_string
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
done \
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
) )
IFS="$ORIGINAL_IFS"
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_OPTICAL_DRIVE_DATA[@]}
# echo "$a_temp"
log_function_data "A_OPTICAL_DRIVE_DATA: $a_temp"
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
eval $LOGFE
}
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# get_optical_drive_data;exit
first finalizing version
2011-06-18 03:17:05 +00:00
Changed partition data to work like other functions, create array of array data, then loop through it to print
2008-11-04 03:03:29 +00:00
get_partition_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local a_partition_working='' dev_item='' a_temp='' dev_working_item=''
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
local swap_data='' df_string='' main_partition_data='' df_test='' fs_type=''
local mount_data='' dev_bsd_item=''
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
#local excluded_file_types='--exclude-type=aufs --exclude-type=tmpfs --exclude-type=iso9660'
# df doesn't seem to work in script with variables like at the command line
added --exclude-types: devfs linprocfs sysfs fdescfs the debian kfreebsd kernel shows those on -p output
2010-11-01 20:14:45 +00:00
# added devfs linprocfs sysfs fdescfs which show on debian kfreebsd kernel output
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ -z $BSD_TYPE ]];then
swap_data="$( swapon -s 2>/dev/null )"
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
df_string='df -h -T -P --exclude-type=aufs --exclude-type=devfs --exclude-type=devtmpfs
--exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs
--exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs'
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
else
swap_data="$( swapctl -l 2>/dev/null )"
# default size is 512, -H only for size in human readable format
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# older bsds don't support -T, pain, so we'll use partial output there
df_test=$( df -H -T 2>/dev/null )
if [[ -n $df_test ]];then
df_string='df -H -T'
else
df_string='df -H'
fi
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
fi
main_partition_data="$( eval $df_string )"
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
# set dev disk label/mapper/uuid data globals
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
get_partition_dev_data 'label'
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
get_partition_dev_data 'mapper'
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
get_partition_dev_data 'uuid'
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
log_function_data 'raw' "main_partition_data:\n$main_partition_data\n\nswap_data:\n$swap_data"
bug fix, new kernels/df show both / real filesystem and / and rootfs, creating double / entries. This is fixed with a simple test to get rid of that possible outcome. We'll see if that's sufficient.
2012-02-09 23:35:47 +00:00
# new kernels/df have rootfs and / repeated, creating two entries for the same partition
# so check for two string endings of / then slice out the rootfs one, I could check for it
# before slicing it out, but doing that would require the same action twice re code execution
if [[ $( grep -cs '[[:space:]]/$' <<< "$main_partition_data" ) -gt 1 ]];then
tweaked grep to make sure it's ^rootfs
2012-02-09 23:39:45 +00:00
main_partition_data="$( grep -vs '^rootfs' <<< "$main_partition_data" )"
bug fix, new kernels/df show both / real filesystem and / and rootfs, creating double / entries. This is fixed with a simple test to get rid of that possible outcome. We'll see if that's sufficient.
2012-02-09 23:35:47 +00:00
fi
fixed a logging bug, won't have any impact on users.
2012-02-13 05:27:36 +00:00
log_function_data 'raw' "main_partition_data_post_rootfs:\n$main_partition_data\n\nswap_data:\n$swap_data"
Changed partition data to work like other functions, create array of array data, then loop through it to print
2008-11-04 03:03:29 +00:00
IFS=$'\n'
# sample line: /dev/sda2 ext3 15G 8.9G 4.9G 65% /home
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
# $NF = partition name; $(NF - 4) = partition size; $(NF - 3) = used, in gB; $(NF - 1) = percent used
Made all awk gawk to keep it consistent, this is the type of randomness we need to avoid in the future.
2008-11-07 19:59:11 +00:00
## note: by subtracting from the last field number NF, we avoid a subtle issue with LVM df output, where if
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
## the first field is too long, it will occupy its own line, this way we are getting only the needed data
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
A_PARTITION_DATA=( $( echo "$main_partition_data" | gawk -v bsdType=$BSD_TYPE '
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
BEGIN {
IGNORECASE=1
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
fileSystem=""
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
Comment fix
2009-03-02 02:20:19 +00:00
# this has to be nulled for every iteration so it does not retain value from last iteration
bug fix
2009-03-02 02:16:29 +00:00
devBase=""
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
# skipping these file systems because bsds do not support df --exclude-type=<fstype>
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# note that using $1 to handle older bsd df, which do not support -T. This will not be reliable but we will see
( bsdType != "" ) {
# skip if non disk/partition, or if raid primary id, which will not have a / in it
if ( $1 ~ /^(aufs|devfs|devtmpfs|fdescfs|iso9660|linprocfs|procfs|squashfs|sysfs|tmpfs|type|unionfs)$/ ||
$1 ~ /^([^\/]+)$/ ) {
# note use next, not getline or it does not work right
next
}
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
}
small tweak to logic of partitions
2009-10-14 23:09:30 +00:00
# this is required because below we are subtracting from NF, so it has to be > 5
(change version) bug fix for long file system names in partition data, now correctly shows those too.
2009-02-15 05:09:28 +00:00
# the real issue is long file system names that force the wrap of df output: //fileserver/main
comment tweak
2009-03-02 02:25:53 +00:00
# but we still need to handle more dynamically long space containing file names, but later.
added -P to df to avoid wrapping long lines. -P for posix, which means do not wrap long lines I guess.
2011-07-13 01:27:46 +00:00
# Using df -P should fix this, ie, no wrapping of line lines, but leaving this for now
removed escapes on % for gawk
2011-06-08 07:28:26 +00:00
( NF < 6 ) && ( $0 !~ /[0-9]+%/ ) {
comment fix
2009-03-02 02:18:40 +00:00
# set the dev location here for cases of wrapped output
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
if ( NF == 1 ) {
Bug fix
2009-03-02 02:16:10 +00:00
devBase=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
(no version change, but update) Added wrapped mount point output
2009-03-02 02:15:06 +00:00
}
(change version) bug fix for long file system names in partition data, now correctly shows those too.
2009-02-15 05:09:28 +00:00
getline
}
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
trying a bug fix for devBase partition info
2009-10-14 22:53:34 +00:00
# next set devBase if it didn not get set above here
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
( devBase == "" ) && ( $1 ~ /^\/dev\/|:\/|\/\// ) {
trying a bug fix for devBase partition info
2009-10-14 22:53:34 +00:00
devBase=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
}
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
# this handles zfs type devices/partitions, which do not start with / but contain /
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
( bsdType != "" && devBase == "" && $1 ~ /^[^\/]+\/.+/ ) {
devBase=gensub( /^([^\/]+\/)([^\/]+)$/, "non-dev-\\1\\2", 1, $1 )
}
(change version) fixed bug with strange partition data wrapping in df, should now show root again in fringe cases
2009-03-02 01:55:48 +00:00
# this handles yet another fredforfaen special case where a mounted drive
# has the search string in its name
$NF ~ /^\/$|^\/boot$|^\/var$|^\/home$|^\/tmp$|^\/usr$/ {
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# note, older df in bsd do not have file system column
if ( NF == "7" && $(NF - 1) ~ /[0-9]+%/ ) {
fileSystem=$(NF - 5)
}
else {
fileSystem=""
}
print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",main," fileSystem "," devBase
(change version) fixed bug with strange partition data wrapping in df, should now show root again in fringe cases
2009-03-02 01:55:48 +00:00
}
(Change version) New option -p, outputs all discovered partition information along with the -P stuff. -P was improved to also show /tmp and /usr by default. -p will not show with -F to avoid flooding issues.
2008-12-03 23:14:21 +00:00
# skip all these, including the first, header line. Use the --exclude-type
# to handle new filesystems types we do not want listed here
Tweak to get back all partition data
2009-02-11 18:45:00 +00:00
$NF !~ /^\/$|^\/boot$|^\/var$|^\/home$|^\/tmp$|^\/usr$|^filesystem/ {
(Change version) New option -p, outputs all discovered partition information along with the -P stuff. -P was improved to also show /tmp and /usr by default. -p will not show with -F to avoid flooding issues.
2008-12-03 23:14:21 +00:00
# this is to avoid file systems with spaces in their names, that will make
# the test show the wrong data in each of the fields, if no x%, then do not use
Added support for file system names with 2 or fewer spaces in partition info, fringe cases, but 1.0.0 should be handling most fringe cases decently well by now.
2009-02-11 19:29:48 +00:00
# using 3 cases, first default, standard, 2nd, 3rd, handles one and two spaces in name
removed escapes on % for gawk
2011-06-08 07:28:26 +00:00
if ( $(NF - 1) ~ /[0-9]+%/ ) {
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# note, older df in bsd do not have file system column
if ( NF == "7" ) {
fileSystem=$(NF - 5)
}
else {
fileSystem=""
}
print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",secondary," fileSystem "," devBase
(Change version) New option -p, outputs all discovered partition information along with the -P stuff. -P was improved to also show /tmp and /usr by default. -p will not show with -F to avoid flooding issues.
2008-12-03 23:14:21 +00:00
}
Added support for file system names with 2 or fewer spaces in partition info, fringe cases, but 1.0.0 should be handling most fringe cases decently well by now.
2009-02-11 19:29:48 +00:00
# these two cases construct the space containing name
removed escapes on % for gawk
2011-06-08 07:28:26 +00:00
else if ( $(NF - 2) ~ /[0-9]+%/ ) {
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# note, older df in bsd do not have file system column
if ( NF == "8" && $(NF - 6) !~ /^[0-9]+/ ) {
fileSystem=$(NF - 6)
}
else {
fileSystem=""
}
print $(NF - 1) " " $NF "," $(NF - 5) "," $(NF - 4) "," $(NF - 2) ",secondary," fileSystem "," devBase
Added support for file system names with 2 or fewer spaces in partition info, fringe cases, but 1.0.0 should be handling most fringe cases decently well by now.
2009-02-11 19:29:48 +00:00
}
removed escapes on % for gawk
2011-06-08 07:28:26 +00:00
else if ( $(NF - 3) ~ /[0-9]+%/ ) {
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# note, older df in bsd do not have file system column
if ( NF == "9" && $(NF - 7) !~ /^[0-9]+/ ) {
fileSystem=$(NF - 7)
}
else {
fileSystem=""
}
print $(NF - 2) " " $(NF - 1) " " $NF "," $(NF - 6) "," $(NF - 5) "," $(NF - 3) ",secondary," fileSystem "," devBase
Added support for file system names with 2 or fewer spaces in partition info, fringe cases, but 1.0.0 should be handling most fringe cases decently well by now.
2009-02-11 19:29:48 +00:00
}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' )
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
(change version) New feature in swap partition data: show percent used, this is a damentz patch
2009-03-02 00:52:09 +00:00
# now add the swap partition data, don't want to show swap files, just partitions,
# though this can include /dev/ramzswap0. Note: you can also use /proc/swaps for this
# data, it's the same exact output as swapon -s
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
$( echo "$swap_data" | gawk -v bsdType=$BSD_TYPE '
(change version) New feature in swap partition data: show percent used, this is a damentz patch
2009-03-02 00:52:09 +00:00
BEGIN {
swapCounter = 1
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
usedHolder=""
sizeHolder=""
(change version) New feature in swap partition data: show percent used, this is a damentz patch
2009-03-02 00:52:09 +00:00
}
/^\/dev/ {
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if ( bsdType == "" ) {
usedHolder=$4
sizeHolder=$3
}
else {
usedHolder=$3
sizeHolder=$2
}
size = sprintf( "%.2f", sizeHolder*1024/1000**3 )
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
devBase = gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
used = sprintf( "%.2f", usedHolder*1024/1000**3 )
percentUsed = sprintf( "%.0f", ( usedHolder/sizeHolder )*100 )
removed escapes on % for gawk
2011-06-08 07:28:26 +00:00
print "swap-" swapCounter "," size "GB," used "GB," percentUsed "%,main," "swap," devBase
(change version) New feature in swap partition data: show percent used, this is a damentz patch
2009-03-02 00:52:09 +00:00
swapCounter = ++swapCounter
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
}' ) )
Changed partition data to work like other functions, create array of array data, then loop through it to print
2008-11-04 03:03:29 +00:00
IFS="$ORIGINAL_IFS"
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_PARTITION_DATA[@]}
# echo $a_temp
log_function_data "1: A_PARTITION_DATA:\n$a_temp"
improved logging of arrays for partitions
2011-06-07 01:30:46 +00:00
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
# we'll use this for older systems where no filesystem type is shown in df
if [[ $BSD_TYPE == 'bsd' ]];then
mount_data="$( mount )"
fi
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
# now we'll handle some fringe cases where irregular df -hT output shows /dev/disk/.. instead of
comment clean up
2010-09-16 21:21:25 +00:00
# /dev/h|sdxy type data for column 1, . A_PARTITION_DATA[6]
added a comment
2010-09-29 16:38:37 +00:00
# Here we just search for the uuid/label and then grab the end of the line to get the right dev item.
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
for (( i=0; i < ${#A_PARTITION_DATA[@]}; i++ ))
do
IFS=","
a_partition_working=( ${A_PARTITION_DATA[i]} )
IFS="$ORIGINAL_IFS"
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
dev_item=${a_partition_working[6]} # reset each loop
fs_type=${a_partition_working[5]}
# older bsds have df minus -T so can't get fs type easily, try using mount instead
if [[ $BSD_TYPE == 'bsd' && -z $fs_type && -n $dev_item ]];then
dev_bsd_item=$( sed -e 's/non-dev-//' -e 's|/|\\/|g' <<< "$dev_item" )
fs_type=$( gawk -F '(' '
/'$dev_bsd_item'/ {
# slice out everything after / plus the first comma
sub( /,.*/, "", $2 )
print $2
exit
}' <<< "$mount_data" )
fi
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
# note: for swap this will already be set
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ -n $( grep -E '(by-uuid|by-label)' <<< $dev_item ) ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
dev_working_item=${dev_item##*/}
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
if [[ -n $DEV_DISK_UUID ]];then
dev_item=$( echo "$DEV_DISK_UUID" | gawk '
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
$0 ~ /[ /t]'$dev_working_item'[ /t]/ {
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
print item
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
exit
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
}' )
fi
# if we didn't find anything for uuid try label
if [[ -z $dev_item && -n $DEV_DISK_LABEL ]];then
dev_item=$( echo "$DEV_DISK_LABEL" | gawk '
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
$0 ~ /[ /t]'$dev_working_item'[ /t]/ {
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
print item
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
exit
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
}' )
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
elif [[ -n $( grep 'mapper/' <<< $dev_item ) ]];then
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
# get the mapper actual dev item
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
dev_item=$( get_dev_processed_item "$dev_item" )
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
fi
if [[ -n $dev_item ]];then
# assemble everything we could get for dev/h/dx, label, and uuid
IFS=","
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
A_PARTITION_DATA[i]=${a_partition_working[0]}","${a_partition_working[1]}","${a_partition_working[2]}","${a_partition_working[3]}","${a_partition_working[4]}","$fs_type","$dev_item
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
IFS="$ORIGINAL_IFS"
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
fi
done
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_PARTITION_DATA[@]}
# echo $a_temp
log_function_data "2: A_PARTITION_DATA:\n$a_temp"
(version change) Hopefully close to last cleanup and tweaks before releasing 1.0.0, but we'll see if more features or fixes need to be implemented.
2009-02-05 18:52:17 +00:00
if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]];then
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
get_partition_data_advanced
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
}
# first get the locations of the mount points for label/uuid detection
get_partition_data_advanced()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
local a_partition_working='' dev_partition_data=''
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local dev_item='' dev_label='' dev_uuid='' a_temp=''
local variables added to cleanup
2009-02-05 02:12:18 +00:00
local mount_point=''
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
# set dev disk label/mapper/uuid data globals
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
get_partition_dev_data 'label'
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
get_partition_dev_data 'mapper'
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
get_partition_dev_data 'uuid'
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
if [[ $B_MOUNTS_FILE == 'true' ]];then
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
for (( i=0; i < ${#A_PARTITION_DATA[@]}; i++ ))
do
IFS=","
a_partition_working=( ${A_PARTITION_DATA[i]} )
IFS="$ORIGINAL_IFS"
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
# note: for swap this will already be set
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
if [[ -z ${a_partition_working[6]} ]];then
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
mount_point=$( sed 's|/|\\/|g' <<< ${a_partition_working[0]} )
#echo mount_point $mount_point
dev_partition_data=$( gawk '
BEGIN {
IGNORECASE = 1
partition = ""
partTemp = ""
}
trying to handle weird space in name case
2009-02-26 17:15:09 +00:00
# trying to handle space in name
didn't workO
2009-02-26 17:17:12 +00:00
# gsub( /\\040/, " ", $0 )
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
/[ \t]'$mount_point'[ \t]/ && $1 != "rootfs" {
# initialize the variables
label = ""
uuid = ""
# slice out the /dev
partition=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
# label and uuid can occur for root, set partition to null now
if ( partition ~ /by-label/ ) {
label=gensub( /^(\/dev\/disk\/by-label\/)(.+)$/, "\\2", 1, $1 )
partition = ""
}
if ( partition ~ /by-uuid/ ) {
uuid=gensub( /^(\/dev\/disk\/by-uuid\/)(.+)$/, "\\2", 1, $1 )
partition = ""
}
comment clean up
2009-03-02 02:38:16 +00:00
# handle /dev/root for / id
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
if ( partition == "root" ) {
# if this works, great, otherwise, just set this to null values
partTemp="'$( readlink /dev/root 2>/dev/null )'"
if ( partTemp != "" ) {
added support for virtual disks, like /dev/vda3 for partitions / disks
2011-04-21 01:16:09 +00:00
if ( partTemp ~ /[hsv]d[a-z][0-9]{1,2}/ ) {
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
partition=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, partTemp )
}
(change version) Found and fixed a small bug with / label detection in cases where root is mounted by uuid, now it works again
2009-02-07 03:58:32 +00:00
else if ( partTemp ~ /by-uuid/ ) {
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
uuid=gensub( /^(\/dev\/disk\/by-uuid\/)(.+)$/, "\\2", 1, partTemp )
(change version) Fixed problem with false /dev output for /dev/root, needed to set partition to null again when located in uuid or label
2009-03-02 02:32:16 +00:00
partition="" # set null to let real location get discovered
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
}
else if ( partTemp ~ /by-label/ ) {
label=gensub( /^(\/dev\/disk\/by-label\/)(.+)$/, "\\2", 1, partTemp )
(change version) Fixed problem with false /dev output for /dev/root, needed to set partition to null again when located in uuid or label
2009-03-02 02:32:16 +00:00
partition="" # set null to let real location get discovered
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
}
}
else {
partition = ""
label = ""
uuid = ""
}
}
print partition "," label "," uuid
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
exit
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}' $FILE_MOUNTS )
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
# assemble everything we could get for dev/h/dx, label, and uuid
IFS=","
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
A_PARTITION_DATA[i]=${a_partition_working[0]}","${a_partition_working[1]}","${a_partition_working[2]}","${a_partition_working[3]}","${a_partition_working[4]}","${a_partition_working[5]}","$dev_partition_data
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
IFS="$ORIGINAL_IFS"
fi
## now we're ready to proceed filling in the data
IFS=","
a_partition_working=( ${A_PARTITION_DATA[i]} )
IFS="$ORIGINAL_IFS"
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
# get the mapper actual dev item first, in case it's mapped
dev_item=$( get_dev_processed_item "${a_partition_working[6]}" )
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# make sure not to slice off rest if it's a network mounted file system
if [[ -n $dev_item && -z $( grep -E '(^//|:/)' <<< $dev_item ) ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
dev_item=${dev_item##*/} ## needed to avoid error in case name still has / in it
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
fi
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
dev_label=${a_partition_working[7]}
dev_uuid=${a_partition_working[8]}
(change version) Found and fixed a small bug with / label detection in cases where root is mounted by uuid, now it works again
2009-02-07 03:58:32 +00:00
# then if dev data/uuid is incomplete, try to get missing piece
# it's more likely we'll get a uuid than a label. But this should get the
bug fix for label/uuid for root, that was trickier than I realized
2009-02-07 07:48:35 +00:00
# dev item set no matter what, so then we can get the rest of any missing data
# first we'll get the dev_item if it's missing
Patch version upgrade fixed a bug with remote mounted partitions, created line length counter function that cleans off color code characters to allow for accurate line counts for line breaks.
2011-06-19 05:53:18 +00:00
if [[ -z $dev_item ]];then
if [[ -n $DEV_DISK_UUID && -n $dev_uuid ]];then
dev_item=$( echo "$DEV_DISK_UUID" | gawk '
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
$0 ~ /[ \t]'$dev_uuid'[ \t]/ {
Patch version upgrade fixed a bug with remote mounted partitions, created line length counter function that cleans off color code characters to allow for accurate line counts for line breaks.
2011-06-19 05:53:18 +00:00
item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
print item
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
exit
Patch version upgrade fixed a bug with remote mounted partitions, created line length counter function that cleans off color code characters to allow for accurate line counts for line breaks.
2011-06-19 05:53:18 +00:00
}' )
elif [[ -n $DEV_DISK_LABEL && -n $dev_label ]];then
dev_item=$( echo "$DEV_DISK_LABEL" | gawk '
# first we need to change space x20 in by-label back to a real space
#gsub( /x20/, " ", $0 )
# then we can see if the string is there
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
$0 ~ /[ \t]'$dev_label'[ \t]/ {
Patch version upgrade fixed a bug with remote mounted partitions, created line length counter function that cleans off color code characters to allow for accurate line counts for line breaks.
2011-06-19 05:53:18 +00:00
item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
print item
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
exit
Patch version upgrade fixed a bug with remote mounted partitions, created line length counter function that cleans off color code characters to allow for accurate line counts for line breaks.
2011-06-19 05:53:18 +00:00
}' )
fi
fi
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
Patch version upgrade fixed a bug with remote mounted partitions, created line length counter function that cleans off color code characters to allow for accurate line counts for line breaks.
2011-06-19 05:53:18 +00:00
# this can trigger all kinds of weird errors if it is a non /dev path, like: remote:/machine/name
if [[ -n $dev_item && -z $( grep -E '(^//|:/)' <<< $dev_item ) ]];then
if [[ -n $DEV_DISK_UUID && -z $dev_uuid ]];then
dev_uuid=$( echo "$DEV_DISK_UUID" | gawk '
/'$dev_item'$/ {
print $(NF - 2)
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
exit
(change version) Found and fixed a small bug with / label detection in cases where root is mounted by uuid, now it works again
2009-02-07 03:58:32 +00:00
}' )
Patch version upgrade fixed a bug with remote mounted partitions, created line length counter function that cleans off color code characters to allow for accurate line counts for line breaks.
2011-06-19 05:53:18 +00:00
fi
if [[ -n $DEV_DISK_LABEL && -z $dev_label ]];then
dev_label=$( echo "$DEV_DISK_LABEL" | gawk '
/'$dev_item'$/ {
print $(NF - 2)
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
exit
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
}' )
Patch version upgrade fixed a bug with remote mounted partitions, created line length counter function that cleans off color code characters to allow for accurate line counts for line breaks.
2011-06-19 05:53:18 +00:00
fi
(change version) bug fix, now it should work for all uuid/label
2009-02-07 08:09:00 +00:00
fi
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
# assemble everything we could get for dev/h/dx, label, and uuid
IFS=","
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
A_PARTITION_DATA[i]=${a_partition_working[0]}","${a_partition_working[1]}","${a_partition_working[2]}","${a_partition_working[3]}","${a_partition_working[4]}","${a_partition_working[5]}","$dev_item","$dev_label","$dev_uuid
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
IFS="$ORIGINAL_IFS"
done
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
log_function_data 'cat' "$FILE_MOUNTS"
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
else
if [[ $BSD_TYPE == 'bsd' ]];then
get_partition_data_advanced_bsd
fi
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_PARTITION_DATA[@]}
# echo $a_temp
log_function_data "3-advanced: A_PARTITION_DATA:\n$a_temp"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Changed partition data to work like other functions, create array of array data, then loop through it to print
2008-11-04 03:03:29 +00:00
}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
get_partition_data_advanced_bsd()
{
eval $LOGFS
local gpart_data="$( gpart list 2>/dev/null )"
local a_partition_working='' label_uuid='' dev_item=''
if [[ -n $gpart_data ]];then
for (( i=0; i < ${#A_PARTITION_DATA[@]}; i++ ))
do
IFS=","
a_partition_working=( ${A_PARTITION_DATA[i]} )
IFS="$ORIGINAL_IFS"
# no need to use the rest of the name if it's not a straight /dev/item
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
dev_item=${a_partition_working[6]##*/}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
label_uuid=$( gawk -F ':' '
BEGIN {
IGNORECASE=1
label=""
uuid=""
}
/^[0-9]+\.[[:space:]]*Name.*'$dev_item'/ {
while ( getline && $1 !~ /^[0-9]+\.[[:space:]]*Name/ ) {
if ( $1 ~ /rawuuid/ ) {
gsub(/^[[:space:]]+|[[:space:]]+$/,"",$2)
uuid=$2
}
if ( $1 ~ /label/ ) {
gsub(/^[[:space:]]+|[[:space:]]+$|none|\(null\)/,"",$2)
label=$2
}
}
print label","uuid
exit
}' <<< "$gpart_data" )
# assemble everything we could get for dev/h/dx, label, and uuid
IFS=","
A_PARTITION_DATA[i]=${a_partition_working[0]}","${a_partition_working[1]}","${a_partition_working[2]}","${a_partition_working[3]}","${a_partition_working[4]}","${a_partition_working[5]}","${a_partition_working[6]}","$label_uuid
IFS="$ORIGINAL_IFS"
done
fi
eval $LOGFE
}
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
# args: $1 - uuid/label/id/mapper
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
get_partition_dev_data()
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
{
eval $LOGFS
# only run these tests once per directory to avoid excessive queries to fs
case $1 in
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
id)
if [[ $B_ID_SET != 'true' ]];then
if [[ -d /dev/disk/by-id ]];then
DEV_DISK_ID="$( ls -l /dev/disk/by-id )"
fi
B_ID_SET='true'
fi
;;
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
label)
optimized a bit to reduce fs checks
2010-09-16 21:31:23 +00:00
if [[ $B_LABEL_SET != 'true' ]];then
if [[ -d /dev/disk/by-label ]];then
DEV_DISK_LABEL="$( ls -l /dev/disk/by-label )"
fi
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
B_LABEL_SET='true'
fi
;;
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
mapper)
if [[ $B_MAPPER_SET != 'true' ]];then
if [[ -d /dev/mapper ]];then
DEV_DISK_MAPPER="$( ls -l /dev/mapper )"
fi
B_MAPPER_SET='true'
fi
;;
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
uuid)
optimized a bit to reduce fs checks
2010-09-16 21:31:23 +00:00
if [[ $B_UUID_SET != 'true' ]];then
if [[ -d /dev/disk/by-uuid ]];then
DEV_DISK_UUID="$( ls -l /dev/disk/by-uuid )"
fi
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
B_UUID_SET='true'
fi
;;
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
esac
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
log_function_data 'raw' "DEV_DISK_LABEL:\n$DEV_DISK_LABEL\n\nDEV_DISK_UUID:\n$DEV_DISK_UUID\n\nDEV_DISK_ID:\n$DEV_DISK_ID\n\nDEV_DISK_MAPPER:\n$DEV_DISK_MAPPER"
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
# debugging section, uncomment to insert user data
# DEV_DISK_LABEL='
#
# '
# DEV_DISK_UUID='
#
# '
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
# DEV_DISK_MAPPER='
#
# '
eval $LOGFE
}
# args: $1 - dev item, check for mapper, then get actual dev item if mapped
# eg: lrwxrwxrwx 1 root root 7 Sep 26 15:10 truecrypt1 -> ../dm-2
get_dev_processed_item()
{
eval $LOGFS
local dev_item=$1 dev_return=''
if [[ -n $DEV_DISK_MAPPER && -n $( grep -is 'mapper/' <<< $dev_item ) ]];then
dev_return=$( echo "$DEV_DISK_MAPPER" | gawk '
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
$( NF - 2 ) ~ /^'${dev_item##*/}'$/ {
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
item=gensub( /..\/(.+)/, "\\1", 1, $NF )
print item
}' )
fi
if [[ -z $dev_return ]];then
dev_return=$dev_item
fi
echo $dev_return
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
eval $LOGFE
}
Added script patch number, this will show on update along with version number. Also if > 0, will show added to display version, like: 1.6.3-4 I've found that google svn from googlecode isn't propagating the data across its data centers quickly or consistently which makes testing and debugging a real pain in the butt when dealing with people in different geographical areas. Now we'll be able to confirm that you have dev version xx, ie, the latest uploaded, without doing pointless primary version number bumps. When patch number is 00, no display occurs, but it still shows on updating via -U
2011-06-09 20:09:41 +00:00
get_patch_version_string()
{
New version, new tarball. Cleaned up patch number sed cleanup that didn't work in bsd.
2013-02-09 04:52:57 +00:00
local patch_version_number=$( sed 's/^[0]*//' <<< $SCRIPT_PATCH_NUMBER )
added support for /dev/mapper partitions, those didn't show before, and triggered an error due to / in path, ie, /dev/mapper/truecrypt1 for example. Also fixed some subtle bugs that could in some instances trigger errors on partition label/uuid, not likely, but it could.
2012-10-03 20:53:13 +00:00
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ -n $patch_version_number ]];then
patch_version_number="-$patch_version_number"
# for cases where it was for example: 00-bsd cleaned to --bsd trim out one -
if [[ -n $( grep '\--' <<< $patch_version_number ) ]];then
patch_version_number=$( sed 's/--/-/' <<< $patch_version_number )
fi
Added script patch number, this will show on update along with version number. Also if > 0, will show added to display version, like: 1.6.3-4 I've found that google svn from googlecode isn't propagating the data across its data centers quickly or consistently which makes testing and debugging a real pain in the butt when dealing with people in different geographical areas. Now we'll be able to confirm that you have dev version xx, ie, the latest uploaded, without doing pointless primary version number bumps. When patch number is 00, no display occurs, but it still shows on updating via -U
2011-06-09 20:09:41 +00:00
fi
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
echo $patch_version_number
Added script patch number, this will show on update along with version number. Also if > 0, will show added to display version, like: 1.6.3-4 I've found that google svn from googlecode isn't propagating the data across its data centers quickly or consistently which makes testing and debugging a real pain in the butt when dealing with people in different geographical areas. Now we'll be able to confirm that you have dev version xx, ie, the latest uploaded, without doing pointless primary version number bumps. When patch number is 00, no display occurs, but it still shows on updating via -U
2011-06-09 20:09:41 +00:00
}
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
get_pciconf_data()
{
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local pciconf_data='' a_temp=''
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
if [[ $B_PCICONF == 'true' ]];then
pciconf_data="$( pciconf -lv 2>/dev/null )"
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
if [[ -n $pciconf_data ]];then
pciconf_data=$( gawk '
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
BEGIN {
IGNORECASE=1
}
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
{
gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
gsub(/[[:space:]]+=[[:space:]]+/, "=",$0)
gsub(/^[[:space:]]+|'"'"'|\"|,/, "", $0)
gsub(/=0x/,"=",$0)
# line=gensub(/.*[[:space:]]+(class=[^[:space:]]*|card=[^[:space:]]*)|chip=[^[:space:]]*|rev=[^[:space:]]*|hdr=[^[:space:]]*).*/,"\n\\1","g",$0)
line=gensub(/(.*@.*)/,"\n\\1",$0)
print line
}' <<< "$pciconf_data" )
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
# create empty last line with this spacing trick
pciconf_data="$pciconf_data
EOF"
# echo "$pciconf_data"
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
# now insert into arrays
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
IFS=$'\n'
A_PCICONF_DATA=( $( gawk '
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
BEGIN {
fullLine=""
driver=""
vendor=""
device=""
class=""
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
chipId=""
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
pciId=""
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
itemData=""
IGNORECASE=1
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
}
/^.*@/ {
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
pciId=""
vendor=""
class=""
driver=""
device=""
chipId=""
itemData=$1
driver=gensub(/^([^@]+)@.*/, "\\1", itemData )
pciId=gensub(/^.*@pci([0-9\.:]+).*/, "\\1", itemData )
sub(/:$/, "", pciId)
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 )
if ( $2 == "class=020000" ) {
class="network"
}
else if ( $2 == "class=030000" ) {
class="display"
}
else if ( $2 == "class=040300" ) {
class="audio"
}
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
while ( getline && $1 !~ /^$/ ) {
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
if ( $1 ~ /^vendor/ ) {
sub(/^vendor=/, "", $1 )
vendor=$0
}
else if ( $1 ~ /^device/ ) {
sub(/^device=/, "", $1 )
device=$0
}
else if ( $1 ~ /^class=/ && class == "" ) {
sub(/^class=/, "", $1)
class=$0
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
}
}
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
if ( device == "" ) {
device=vendor
}
fullLine=class "," device "," vendor "," driver "," pciId "," chipId
print fullLine
}' <<< "$pciconf_data" ))
IFS="$ORIGINAL_IFS"
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
fi
else
A_PCICONF_DATA='pciconf-not-installed'
fi
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
B_PCICONF_SET='true'
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_PCICONF_DATA[@]}
log_function_data "$a_temp"
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
log_function_data "$pciconf_data"
eval $LOGFE
}
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
# packs standard card arrays using the pciconf stuff
# args: $1 - audio/network/display - matches first item in A_PCICONF_DATA arrays
get_pciconf_card_data()
{
eval $LOGFS
local a_temp='' array_string='' j=0 device_string=''
local ip_tool_command=$( type -p ifconfig )
local mac='' state='' speed='' duplex='' network_string=''
for (( i=0;i<${#A_PCICONF_DATA[@]};i++ ))
do
IFS=','
a_temp=( ${A_PCICONF_DATA[i]} )
IFS="$ORIGINAL_IFS"
if [[ ${a_temp[0]} == $1 ]];then
# don't print the vendor if it's already in the device name
if [[ -z $( grep -i "${a_temp[2]}" <<< "${a_temp[1]}" ) ]];then
device_string="${a_temp[2]} ${a_temp[1]}"
else
device_string=${a_temp[1]}
fi
case $1 in
audio)
array_string="$device_string,${a_temp[3]},,,${a_temp[4]},,${a_temp[5]}"
A_AUDIO_DATA[j]=$array_string
;;
display)
array_string="$device_string,${a_temp[4]},${a_temp[5]}"
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
A_GRAPHICS_CARD_DATA[j]=$array_string
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
;;
network)
if [[ -n $ip_tool_command && -n ${a_temp[3]} ]];then
network_string=$( $ip_tool_command ${a_temp[3]} | gawk '
BEGIN {
IGNORECASE=1
mac=""
state=""
speed=""
duplex=""
}
/^[[:space:]]*ether/ {
mac = $2
}
/^[[:space:]]*media/ {
if ( $0 ~ /<.*>/ ) {
duplex=gensub(/.*<([^>]+)>.*/,"\\1",$0)
}
if ( $0 ~ /\(.*\)/ ) {
speed=gensub(/.*\(([^<[:space:]]+).*\).*/,"\\1",$0)
}
}
/^[[:space:]]*status/ {
sub(/.*status[:]?[[:space:]]*/,"", $0)
state=$0
}
END {
print state "~" speed "~" mac "~" duplex
}')
fi
if [[ -n $network_string ]];then
mac=$( cut -d '~' -f 3 <<< $network_string )
state=$( cut -d '~' -f 1 <<< $network_string )
speed=$( cut -d '~' -f 2 <<< $network_string )
duplex=$( cut -d '~' -f 4 <<< $network_string )
fi
array_string="$device_string,${a_temp[3]},,,${a_temp[4]},${a_temp[3]},$state,$speed,$duplex,$mac,${a_temp[5]}"
A_NETWORK_DATA[j]=$array_string
;;
esac
((j++))
fi
done
eval $LOGFE
}
(change version) cleaned ps functions up a bit, made args more clean. Added in output to let users know why their irc request for > 5 lines is 5, throttled from x.
2010-02-14 17:15:44 +00:00
# args: $1 - type cpu/mem
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
get_ps_tcm_data()
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
{
eval $LOGFS
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
local array_length='' reorder_temp='' i=0 head_tail='' sort_type='' ps_data=''
bug fix, have to reverse sort orders too, sigh...
2010-02-14 03:49:54 +00:00
# bummer, have to make it more complex here because of reverse sort
# orders in output, pesky lack of support of +rss in old systems
case $1 in
(change version) cleaned ps functions up a bit, made args more clean. Added in output to let users know why their irc request for > 5 lines is 5, throttled from x.
2010-02-14 17:15:44 +00:00
mem)
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ $BSD_TYPE != 'bsd' ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
sort_type='ps aux --sort -rss'
head_tail='head'
else
sort_type='ps aux -m'
head_tail='head'
fi
bug fix, have to reverse sort orders too, sigh...
2010-02-14 03:49:54 +00:00
;;
(change version) cleaned ps functions up a bit, made args more clean. Added in output to let users know why their irc request for > 5 lines is 5, throttled from x.
2010-02-14 17:15:44 +00:00
cpu)
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ $BSD_TYPE != 'bsd' ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
sort_type='ps aux --sort %cpu'
head_tail='tail'
else
sort_type='ps aux -r'
head_tail='head'
fi
bug fix, have to reverse sort orders too, sigh...
2010-02-14 03:49:54 +00:00
;;
esac
(change version) added filter, only 5 or less allowed in irc client, terminal 20 or less supported.
2010-02-13 05:43:35 +00:00
# throttle potential irc abuse
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'true' && $PS_COUNT -gt 5 ]];then
(change version) cleaned ps functions up a bit, made args more clean. Added in output to let users know why their irc request for > 5 lines is 5, throttled from x.
2010-02-14 17:15:44 +00:00
PS_THROTTLED=$PS_COUNT
(change version) added filter, only 5 or less allowed in irc client, terminal 20 or less supported.
2010-02-13 05:43:35 +00:00
PS_COUNT=5
fi
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
# use eval here to avoid glitches with -
ps_data="$( eval $sort_type )"
fine tuned output, changed app: to either command: or daemon: , app isn't very accurate since it can be many things.
2010-02-16 23:02:01 +00:00
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
IFS=$'\n'
# note that inxi can use a lot of cpu, and can actually show up here as the script runs
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
A_PS_DATA=( $( echo "$ps_data" | grep -Ev "($SCRIPT_NAME|%CPU|[[:space:]]ps[[:space:]])" | $head_tail -n $PS_COUNT | gawk '
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
BEGIN {
IGNORECASE=1
appName=""
appPath=""
appStarterName=""
appStarterPath=""
cpu=""
mem=""
pid=""
user=""
cleaned up some variable misnamings
2010-02-13 06:10:31 +00:00
rss=""
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
}
{
cpu=$3
mem=$4
pid=$2
user=$1
cleaned up some variable misnamings
2010-02-13 06:10:31 +00:00
rss=sprintf( "%.2f", $6/1024 )
(change version) small bug fix in -t, gawk has to strip out [,],(,) to avoid compare errors in bash for things like [nfsd] in output
2010-02-16 22:43:23 +00:00
# have to get rid of [,],(,) eg: [lockd] which break the printout function compare in bash
bug fix
2010-02-16 22:44:57 +00:00
gsub(/\[|\]|\(|\)/,"~", $0 )
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
if ( $12 ~ /^\// ){
appStarterPath=$11
appPath=$12
}
else {
appStarterPath=$11
appPath=$11
}
(change version) small bug fix in -t, gawk has to strip out [,],(,) to avoid compare errors in bash for things like [nfsd] in output
2010-02-16 22:43:23 +00:00
appStarterName=gensub( /(\/.*\/)(.*)/, "\\2", "1", appStarterPath )
appName=gensub( /(\/.*\/)(.*)/, "\\2", "1", appPath )
cleaned up some variable misnamings
2010-02-13 06:10:31 +00:00
print appName "," appPath "," appStarterName "," appStarterPath "," cpu "," mem "," pid "," rss "," user
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
}
' ) )
# make the array ordered highest to lowest so output looks the way we expect it to
(change version, small bug fix) fixed small issue, discovered that etch bash/ps does not support the + operator for --sort, only -, eg: +rss fails and -rss works.
2010-02-14 03:44:10 +00:00
# this isn't necessary for -rss, and we can't make %cpu ordered the other way, so
# need to reverse it here. -rss is used because on older systems +rss is not supported
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ $1 == 'cpu' && $BSD_TYPE != 'bsd' ]];then
(change version, small bug fix) fixed small issue, discovered that etch bash/ps does not support the + operator for --sort, only -, eg: +rss fails and -rss works.
2010-02-14 03:44:10 +00:00
array_length=${#A_PS_DATA[@]};
while (( $i < $array_length/2 ))
do
small issue fix for intel ht dual core, it has bad core ids, so I had to replace smart count with a manual dumb count, that works
2010-03-05 07:22:56 +00:00
reorder_temp=${A_PS_DATA[i]}f
(change version, small bug fix) fixed small issue, discovered that etch bash/ps does not support the + operator for --sort, only -, eg: +rss fails and -rss works.
2010-02-14 03:44:10 +00:00
A_PS_DATA[i]=${A_PS_DATA[$array_length-$i-1]}
A_PS_DATA[$array_length-$i-1]=$reorder_temp
(( i++ ))
done
fi
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
IFS="$ORIGINAL_IFS"
# echo ${A_PS_DATA[@]}
eval $LOGFE
}
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
# mdstat syntax information: http://www-01.ibm.com/support/docview.wss?uid=isg3T1011259
# note that this does NOT use either Disk or Partition information for now, ie, there
# is no connection between the data types, but the output should still be consistent
get_raid_data()
{
eval $LOGFS
local mdstat=''
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
if [[ $B_MDSTAT_FILE == 'true' ]];then
added a protection against no /proc/mdstat might be needed on old systems, we'll see.
2012-05-11 06:21:32 +00:00
mdstat="$( cat $FILE_MDSTAT 2>/dev/null )"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
if [[ -n $mdstat ]];then
# need to make sure there's always a newline in front of each record type, and
# also correct possible weird formats for the output from older kernels etc.
mdstat="$( sed -e 's/^md/\nmd/' -e 's/^unused[[:space:]]/\nunused /' \
-e 's/read_ahead/\nread_ahead/' -e 's/^resync=/\nresync=/' -e 's/^Event/\nEvent/' \
New version, bug fix for mdraid, and cleaned up some errors and weak spots in component output for mdraid. Certain conditions would trigger a false return for raid components, now it shows more explicitly the online/spare/failed data so it's clear. Also shows 'none' for online if none are detected.
2013-02-27 22:02:44 +00:00
-e 's/^[[:space:]]*$//' -e 's/[[:space:]]read_ahead/\nread_ahead/' <<< "$mdstat" )"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
# some fringe cases do not end as expected, so need to add newlines plus EOF to make sure while loop doesn't spin
mdstat=$( echo -e "$mdstat\n\nEOF" )
IFS=$'\n'
A_RAID_DATA=( $(
gawk '
BEGIN {
IGNORECASE=1
RS="\n"
}
/^personalities/ {
KernelRaidSupport = gensub(/personalities[[:space:]]*:[[:space:]]*(.*)/, "\\1", 1, $0)
# clean off the brackets
gsub(/[\[\]]/,"",KernelRaidSupport)
print "KernelRaidSupport," KernelRaidSupport
}
/^read_ahead/ {
ReadAhead=gensub(/read_ahead (.*)/, "\\1", 1 )
print "ReadAhead," ReadAhead
}
/^Event:/ {
print "raidEvent," $NF
}
# print logic will search for this value and use it to print out the unused devices data
/^unused devices/ {
unusedDevices = gensub(/^unused devices:[[:space:]][<]?([^>]*)[>]?.*/, "\\1", 1, $0)
print "UnusedDevices," unusedDevices
}
/^md/ {
# reset for each record loop through
deviceState = ""
bitmapValues = ""
blocks = ""
chunkSize = ""
components = ""
device = ""
deviceReport = ""
finishTime = ""
recoverSpeed = ""
recoveryProgressBar = ""
recoveryPercent = ""
raidLevel = ""
sectorsRecovered = ""
separator = ""
superBlock = ""
uData = ""
while ( !/^[[:space:]]*$/ ) {
gsub(/,/, " ", $0 )
gsub(/[[:space:]]+/, " ", $0 )
if ( $0 ~ /^md/ ) {
device = gensub(/(md.*)[[:space:]]?:/, "\\1", "1", $1 )
}
New version, bug fix for mdraid, and cleaned up some errors and weak spots in component output for mdraid. Certain conditions would trigger a false return for raid components, now it shows more explicitly the online/spare/failed data so it's clear. Also shows 'none' for online if none are detected.
2013-02-27 22:02:44 +00:00
if ( $0 ~ /mirror|raid[0-9]+/ ) {
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
raidLevel = gensub(/(.*)raid([0-9]+)(.*)/, "\\2", "g", $0 )
}
if ( $0 ~ /(active \(auto-read-only\)|active|inactive)/ ) {
deviceState = gensub(/(.*) (active \(auto-read-only\)|active|inactive) (.*)/, "\\2", "1", $0 )
}
# gawk will not return all the components using gensub, only last one
separator = ""
for ( i=3; i<=NF; i++ ) {
if ( $i ~ /[hs]d[a-z][0-9]*(\[[0-9]+\])?(\([SF]\))?/ ) {
components = components separator $i
separator=" "
}
}
if ( $0 ~ /blocks/ ) {
blocks = gensub(/(.*[[:space:]]+)?([0-9]+)[[:space:]]blocks.*/, "\\2", "1", $0)
}
if ( $0 ~ /super[[:space:]][0-9\.]+/ ) {
superBlock = gensub(/.*[[:space:]]super[[:space:]]([0-9\.]+)[[:space:]].*/, "\\1", "1", $0)
}
if ( $0 ~ /algorithm[[:space:]][0-9\.]+/ ) {
algorithm = gensub(/.*[[:space:]]algorithm[[:space:]]([0-9\.]+)[[:space:]].*/, "\\1", "1", $0)
}
if ( $0 ~ /\[[0-9]+\/[0-9]+\]/ ) {
deviceReport = gensub(/.*[[:space:]]\[([0-9]+\/[0-9]+)\][[:space:]].*/, "\\1", "1", $0)
uData = gensub(/.*[[:space:]]\[([U_]+)\]/, "\\1", "1", $0)
}
# need to avoid this: bitmap: 0/10 pages [0KB], 16384KB chunk
# while currently all the normal chunks are marked with k, not kb, this can change in the future
if ( $0 ~ /[0-9]+[k] chunk/ && $0 !~ /bitmap/ ) {
chunkSize = gensub(/(.*) ([0-9]+[k]) chunk.*/, "\\2", "1", $0)
}
if ( $0 ~ /^resync=/ ) {
sub(/resync=/,"")
print "resyncStatus," $0
}
if ( $0 ~ /\[[=]*>[\.]*\].*(resync|recovery)/ ) {
recoveryProgressBar = gensub(/.*(\[[=]*>[\.]*\]).*/, "\\1",1,$0)
}
if ( $0 ~ / (resync|recovery)[[:space:]]*=/ ) {
recoveryPercent = gensub(/.* (resync|recovery)[[:space:]]*=[[:space:]]*([0-9\.]+%).*/, "\\1~\\2", 1 )
if ( $0 ~ /[[:space:]]\([0-9]+\/[0-9]+\)/ ) {
sectorsRecovered = gensub(/.* \(([0-9]+\/[0-9]+)\).*/, "\\1", 1, $0 )
}
if ( $0 ~ /finish[[:space:]]*=/ ) {
finishTime = gensub(/.* finish[[:space:]]*=[[:space:]]*([[0-9\.]+)([a-z]+) .*/, "\\1 \\2", 1, $0 )
}
if ( $0 ~ /speed[[:space:]]*=/ ) {
recoverSpeed = gensub(/.* speed[[:space:]]*=[[:space:]]*([[0-9\.]+)([a-z]+\/[a-z]+)/, "\\1 \\2", 1, $0 )
}
}
if ( $0 ~ /bitmap/ ) {
bitmapValues = gensub(/(.*[[:space:]])?bitmap:(.*)/, "\\2", 1, $0 )
}
getline
}
raidString = device "," deviceState "," raidLevel "," components "," deviceReport "," uData
raidString = raidString "," blocks "," superBlock "," algorithm "," chunkSize "," bitmapValues
raidString = raidString "," recoveryProgressBar "," recoveryPercent "," sectorsRecovered "," finishTime "," recoverSpeed
print raidString
}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
' <<< "$mdstat" ) )
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
IFS="$ORIGINAL_IFS"
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
else
if [[ $BSD_TYPE == 'bsd' ]];then
get_raid_data_bsd
fi
fi
New version, updated man page. A bug fix for an old time bug: with mdraid, -o (unmounted partitions) would show components of the md raid array as unmounted partitions. This is of course incorrect, and is now fixed. Small update of man page as well to note that -o will not show components of mdraid arrays.
2013-02-28 06:12:04 +00:00
B_RAID_SET='true'
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_RAID_DATA[@]}
log_function_data "A_RAID_DATA: $a_temp"
# echo -e "A_RAID_DATA:\n${a_temp}"
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
eval $LOGFE
}
get_raid_data_bsd()
{
eval $LOGFS
local zpool_path=$( type -p zpool 2>/dev/null )
local zpool_data=''
if [[ -n $zpool_path ]];then
B_BSD_RAID='true'
# bsd sed does not support inserting a true \n so use this trick
zpool_data="$( $zpool_path list -v | sed $SED_RX 's/^([^[:space:]])/\
\1/' )"
# echo "$zpool_data"
IFS=$'\n'
A_RAID_DATA=( $(
gawk '
BEGIN {
raidString=""
separator=""
components=""
reportSize=""
blocksAvailable=""
chunkRaidAllocated=""
}
/SIZE.*ALLOC/ {
sub(/.*ALLOC.*/,"", $0)
}
/^[^[:space:]]/ {
components=""
separator=""
raidLevel=""
device=$1
deviceState=$7
reportSize=$2
blocksAvailable=$4
chunkRaidAllocated=$3
# go to the next line now, this will probably need fixing later with weird data sets
getline
if ( $1 != "" ) {
raidLevel="zfs " $1
}
while ( getline && $1 !~ /^$/ ) {
# print $1
components = components separator $1
separator=" "
}
# print $1
raidString = device "," deviceState "," raidLevel "," components "," reportSize "," uData
raidString = raidString "," blocksAvailable "," superBlock "," algorithm "," chunkRaidAllocated
# none of these are used currently
raidString = raidString "," bitmapValues "," recoveryProgressBar "," recoveryPercent
raidString = raidString "," sectorsRecovered "," finishTime "," recoverSpeed
gsub(/~/,"",raidString)
print raidString
small bug fix, cleaned up for older bsds )) on their own line.
2013-02-27 20:57:24 +00:00
}' <<< "$zpool_data" ) )
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
IFS="$ORIGINAL_IFS"
get_raid_component_data_bsd
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
eval $LOGFE
}
# note, we've already tested for zpool so no further tests required
get_raid_component_data_bsd()
{
eval $LOGFS
local a_raid_data='' array_string='' component='' component_string=''
local zpool_status='' device='' separator='' component_status=''
for (( i=0; i<${#A_RAID_DATA[@]}; i++))
do
IFS=","
a_raid_data=( ${A_RAID_DATA[i]} )
IFS="$ORIGINAL_IFS"
separator=''
component_string=''
component_status=''
zpool_status=''
device=${a_raid_data[0]}
zpool_status="$( zpool status $device )"
# we will remove ONLINE for status and only use OFFLINE/DEGRADED as tests
# for print output display of issues with components
for component in ${a_raid_data[3]}
do
component_status=$( gawk '
BEGIN {
IGNORECASE=1
}
$1 ~ /^'$component'$/ {
sub( /ONLINE/, "", $2 )
print "'$component'" $2
exit
}' <<< "$zpool_status" )
component_string="$component_string$separator$component_status"
separator=' '
done
array_string="$device,${a_raid_data[1]},${a_raid_data[2]},$component_string,${a_raid_data[4]}"
array_string="$array_string,${a_raid_data[5]},${a_raid_data[6]},${a_raid_data[7]},${a_raid_data[8]}"
array_string="$array_string,${a_raid_data[9]},${a_raid_data[10]},${a_raid_data[11]},${a_raid_data[12]},"
array_string="$array_string${a_raid_data[13]},${a_raid_data[14]},${a_raid_data[15]}"
IFS=","
A_RAID_DATA[i]=$array_string
IFS="$ORIGINAL_IFS"
done
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
eval $LOGFE
}
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
# get_raid_data_bsd;exit
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
comment update
2009-10-13 20:34:00 +00:00
# Repos will be added as we get distro package manager data to create the repo data.
# This method will output the file name also, which is useful to create output that's
fixed pardus/pisi sources collection to fit with new method, new tarball, no new version number
2012-12-22 04:39:52 +00:00
# neat and readable. Each line of the total number contains the following sections,
# separated by a : for splitting in the print function
# part one, repo type/string : part two, file name, if present, of info : part 3, repo data
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
get_repo_data()
{
added in some logging data
2010-01-09 04:17:22 +00:00
eval $LOGFS
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
local repo_file='' repo_data_working='' repo_data_working2='' repo_line='' repo_files=''
local repo_name=''
code tweak for yum
2009-10-13 21:35:37 +00:00
local apt_file='/etc/apt/sources.list' yum_repo_dir='/etc/yum.repos.d/' yum_conf='/etc/yum.conf'
after getting user data, added pardus pisi repo listing support for the -r repo list option. This method will probably work for arch too I'd guess if pacman lists repos in the same way
2010-02-01 02:52:30 +00:00
local pacman_conf='/etc/pacman.conf' pacman_repo_dir='/etc/pacman.d/' pisi_dir='/etc/pisi/'
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
local zypp_repo_dir='/etc/zypp/repos.d/' freebsd_conf='/etc/portsnap.conf'
added arch support for -r option
2010-02-01 05:51:09 +00:00
new tarball, new version. This fixes a somewhat obscure issue where for example rpmforge adds apt repos, and also I assume some apt rpm tools might do the same for yum repos. Now inxi will simply note the presence of each type, for apt and yum. I didnt' do this feature for pacman and pisi, because I've never heard of that, but if necessary, I'll add it. Now inxi will hopefully correctly note the presence of the various repos and list the files with the repo type correctly noted for each type. I also fixed a bug in the yum/rpm type repo detection, inxi failed to properly handle spaces around the = sign, which made it falsely identify as enabled disabled repos, it tested for only ^enabled=1 whereas also ^enabled = 1 is a possible syntax. This is now corrected.
2012-12-22 04:01:02 +00:00
# apt - debian, buntus, also sometimes some yum/rpm repos may create apt repos here as well
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
if [[ -f $apt_file || -d $apt_file.d ]];then
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
REPO_DATA="$( grep -Esv '(^[[:space:]]*$|^[[:space:]]*#)' $apt_file $apt_file.d/*.list | sed $SED_RX 's/^(.*)/apt sources:\1/' )"
new tarball, new version. This fixes a somewhat obscure issue where for example rpmforge adds apt repos, and also I assume some apt rpm tools might do the same for yum repos. Now inxi will simply note the presence of each type, for apt and yum. I didnt' do this feature for pacman and pisi, because I've never heard of that, but if necessary, I'll add it. Now inxi will hopefully correctly note the presence of the various repos and list the files with the repo type correctly noted for each type. I also fixed a bug in the yum/rpm type repo detection, inxi failed to properly handle spaces around the = sign, which made it falsely identify as enabled disabled repos, it tested for only ^enabled=1 whereas also ^enabled = 1 is a possible syntax. This is now corrected.
2012-12-22 04:01:02 +00:00
fi
# yum - fedora, redhat, centos, etc. Note that rpmforge also may create apt sources
# in /etc/apt/sources.list.d/. Therefore rather than trying to assume what package manager is
# actually running, inxi will merely note the existence of each repo type for apt/yum.
# Also, in rpm, you can install apt-rpm for the apt-get command, so it's not good to check for
# only the commands in terms of selecting which repos to show.
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
if [[ -d $yum_repo_dir || -f $yum_conf || -d $zypp_repo_dir ]];then
if [[ -d $yum_repo_dir || -f $yum_conf ]];then
# older redhats put their yum data in /etc/yum.conf
repo_files=$( ls $yum_repo_dir*.repo $yum_conf 2>/dev/null )
repo_name='yum'
elif [[ -d $zypp_repo_dir ]];then
repo_files=$( ls $zypp_repo_dir*.repo 2>/dev/null )
repo_name='zypp'
fi
if [[ -n $repo_files ]];then
for repo_file in $repo_files
do
repo_data_working="$( gawk -v repoFile=$repo_file '
# construct the string for the print function to work with, file name: data
function print_line( fileName, repoId, repoUrl ){
print "'$repo_name' sources:" fileName ":" repoId repoUrl
}
BEGIN {
FS="\n"
IGNORECASE=1
(change version) yum made more robust, added /etc/yum.conf support, added support for older syntaxes in redhat, added missing data support. And that's it I hope for yum.
2009-10-13 21:31:30 +00:00
enabledStatus=""
repoTitle=""
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
urlData=""
(change version) yum made more robust, added /etc/yum.conf support, added support for older syntaxes in redhat, added missing data support. And that's it I hope for yum.
2009-10-13 21:31:30 +00:00
}
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
# this is a hack, assuming that each item has these fields listed, we collect the 3
# items one by one, then when the url/enabled fields are set, we print it out and
# reset the data. Not elegant but it works. Note that if enabled was not present
# we assume it is enabled then, and print the line, reset the variables. This will
# miss the last item, so it is printed if found in END
/^\[.+\]/ {
if ( urlData != "" && repoTitle != "" ){
(change version) yum made more robust, added /etc/yum.conf support, added support for older syntaxes in redhat, added missing data support. And that's it I hope for yum.
2009-10-13 21:31:30 +00:00
print_line( repoFile, repoTitle, urlData )
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
enabledStatus=""
urlData=""
repoTitle=""
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
}
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
gsub( /\[|\]/, "", $1 ) # strip out the brackets
repoTitle = $1 " ~ "
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
}
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
/^(mirrorlist|baseurl)/ {
sub( /(mirrorlist|baseurl)[[:space:]]*=[[:space:]]*/, "", $1 ) # strip out the field starter
urlData = $1
(change version) yum made more robust, added /etc/yum.conf support, added support for older syntaxes in redhat, added missing data support. And that's it I hope for yum.
2009-10-13 21:31:30 +00:00
}
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
# note: enabled = 1. enabled = 0 means disabled
/^enabled[[:space:]]*=/ {
enabledStatus = $1
}
# print out the line if all 3 values are found, otherwise if a new
# repoTitle is hit above, it will print out the line there instead
{
if ( urlData != "" && enabledStatus != "" && repoTitle != "" ){
if ( enabledStatus !~ /enabled[[:space:]]*=[[:space:]]*0/ ){
print_line( repoFile, repoTitle, urlData )
}
enabledStatus=""
urlData=""
repoTitle=""
}
}
END {
# print the last one if there is data for it
if ( urlData != "" && repoTitle != "" ){
print_line( repoFile, repoTitle, urlData )
}
}
' $repo_file )"
# then load the global for each file as it gets filled
if [[ -n $repo_data_working ]];then
if [[ -z $REPO_DATA ]];then
REPO_DATA="$repo_data_working"
else
REPO_DATA="$REPO_DATA
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
$repo_data_working"
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
fi
repo_data_working=''
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
fi
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
done
fi
New version, tarball. Added urpmq for -r. Other distros than Mandriva, Mageia, no other changes so no need to update unless you want to. This adds support for Mandriva, Mageia. urpmq parsing is similar but not identical to pisi.
2013-10-05 01:40:00 +00:00
# pacman - archlinux, going to assume that pisi and arch/pacman, etc don't have the above issue with apt/yum
added arch support for -r option
2010-02-01 05:51:09 +00:00
elif [[ -f $pacman_conf ]];then
# get list of mirror include files, trim white space off ends
(change version) Refactored to gawk the arch repo processing in get_repo..
2010-02-01 17:31:46 +00:00
repo_data_working="$( gawk '
BEGIN {
FS="="
IGNORECASE=1
}
/^[[:space:]]*Include/ {
sub(/^[[:space:]]+|[[:space:]]+$/,"",$2)
print $2
}
' $pacman_conf )"
and more comments
2010-02-01 06:22:43 +00:00
# sort into unique paths only, to be used to search for server = data
added arch support for -r option
2010-02-01 05:51:09 +00:00
repo_data_working=$( sort -bu <<< "$repo_data_working" | uniq )
repo_data_working="$repo_data_working $pacman_conf"
for repo_file in $repo_data_working
do
bug fix for pardus pisi line output, added file missing detection for arch repos
2010-02-01 18:02:37 +00:00
if [[ -f $repo_file ]];then
# inserting a new line after each found / processed match
repo_data_working2="$repo_data_working2$( gawk -v repoFile=$repo_file '
BEGIN {
FS="="
IGNORECASE=1
}
/^[[:space:]]*Server/ {
sub(/^[[:space:]]+|[[:space:]]+$/,"",$2)
new tarball, new version. This fixes a somewhat obscure issue where for example rpmforge adds apt repos, and also I assume some apt rpm tools might do the same for yum repos. Now inxi will simply note the presence of each type, for apt and yum. I didnt' do this feature for pacman and pisi, because I've never heard of that, but if necessary, I'll add it. Now inxi will hopefully correctly note the presence of the various repos and list the files with the repo type correctly noted for each type. I also fixed a bug in the yum/rpm type repo detection, inxi failed to properly handle spaces around the = sign, which made it falsely identify as enabled disabled repos, it tested for only ^enabled=1 whereas also ^enabled = 1 is a possible syntax. This is now corrected.
2012-12-22 04:01:02 +00:00
print "pacman repo servers:" repoFile ":" $2 "\\n"
bug fix for pardus pisi line output, added file missing detection for arch repos
2010-02-01 18:02:37 +00:00
}
' $repo_file )"
else
echo "Error: file listed in $pacman_conf does not exist - $repo_file"
fi
added arch support for -r option
2010-02-01 05:51:09 +00:00
done
and more comments
2010-02-01 06:22:43 +00:00
# execute line breaks
added arch support for -r option
2010-02-01 05:51:09 +00:00
REPO_DATA="$( echo -e $repo_data_working2 )"
New version, tarball. Added urpmq for -r. Other distros than Mandriva, Mageia, no other changes so no need to update unless you want to. This adds support for Mandriva, Mageia. urpmq parsing is similar but not identical to pisi.
2013-10-05 01:40:00 +00:00
# pisi - pardus
elif [[ -d $pisi_dir && -n $( type -p pisi ) ]];then
REPO_DATA="$( pisi list-repo )"
# now we need to create the structure: repo info: repo path
# we do that by looping through the lines of the output and then
# putting it back into the <data>:<url> format print repos expects to see
# note this structure in the data, so store first line and make start of line
# then when it's an http line, add it, and create the full line collection.
# Pardus-2009.1 [Aktiv]
# http://packages.pardus.org.tr/pardus-2009.1/pisi-index.xml.bz2
# Contrib [Aktiv]
# http://packages.pardus.org.tr/contrib-2009/pisi-index.xml.bz2
while read repo_line
do
repo_line=$( gawk '
{
# need to dump leading/trailing spaces and clear out color codes for irc output
sub(/^[[:space:]]+|[[:space:]]+$/,"",$0)
# gsub(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]/,"",$0) # leaving this pattern in case need it
gsub(/\[([0-9];)?[0-9]+m/,"",$0)
print $0
}' <<< $repo_line )
if [[ -n $( grep '://' <<< $repo_line ) ]];then
repo_data_working="$repo_data_working:$repo_line\n"
else
repo_data_working="${repo_data_working}pisi repo:$repo_line"
fi
done <<< "$REPO_DATA"
# echo and execute the line breaks inserted
REPO_DATA="$( echo -e $repo_data_working )"
# Mandriva/Mageia using: urpmq
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
elif type -p urpmq &>/dev/null;then
New version, tarball. Added urpmq for -r. Other distros than Mandriva, Mageia, no other changes so no need to update unless you want to. This adds support for Mandriva, Mageia. urpmq parsing is similar but not identical to pisi.
2013-10-05 01:40:00 +00:00
REPO_DATA="$( urpmq --list-media active --list-url )"
# now we need to create the structure: repo info: repo path
# we do that by looping through the lines of the output and then
# putting it back into the <data>:<url> format print repos expects to see
# note this structure in the data, so store first line and make start of line
# then when it's an http line, add it, and create the full line collection.
# Contrib ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2011/x86_64/media/contrib/release
# Contrib Updates ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2011/x86_64/media/contrib/updates
# Non-free ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2011/x86_64/media/non-free/release
# Non-free Updates ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2011/x86_64/media/non-free/updates
New version, new tarball. Only for uprmq distros, small update to add support for another repo type output, the initial listing was not complete of possible syntaxes. Now handles: Nonfree Updates (Local19) /mnt/data/mirrors/mageia/distrib/cauldron/x86_64/media/nonfree/updates as well, apparently that is a possible output format in certain cases with urpmq. Non urpmq distros ignore this update, there are no other actual changes.
2013-10-06 18:10:04 +00:00
# Nonfree Updates (Local19) /mnt/data/mirrors/mageia/distrib/cauldron/x86_64/media/nonfree/updates
New version, tarball. Added urpmq for -r. Other distros than Mandriva, Mageia, no other changes so no need to update unless you want to. This adds support for Mandriva, Mageia. urpmq parsing is similar but not identical to pisi.
2013-10-05 01:40:00 +00:00
while read repo_line
do
repo_line=$( gawk '
{
# need to dump leading/trailing spaces and clear out color codes for irc output
sub(/^[[:space:]]+|[[:space:]]+$/,"",$0)
# gsub(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]/,"",$0) # leaving this pattern in case need it
gsub(/\[([0-9];)?[0-9]+m/,"",$0)
print $0
}' <<< $repo_line )
# urpmq output is the same each line, repo name space repo url, can be:
New version, new tarball. Only for uprmq distros, small update to add support for another repo type output, the initial listing was not complete of possible syntaxes. Now handles: Nonfree Updates (Local19) /mnt/data/mirrors/mageia/distrib/cauldron/x86_64/media/nonfree/updates as well, apparently that is a possible output format in certain cases with urpmq. Non urpmq distros ignore this update, there are no other actual changes.
2013-10-06 18:10:04 +00:00
# rsync://, ftp://, file://, http:// OR repo is locally mounted on FS in some cases
if [[ -n $( grep -E '(://|[[:space:]]/)' <<< $repo_line ) ]];then
New version, tarball. Added urpmq for -r. Other distros than Mandriva, Mageia, no other changes so no need to update unless you want to. This adds support for Mandriva, Mageia. urpmq parsing is similar but not identical to pisi.
2013-10-05 01:40:00 +00:00
# cut out the repo first
small bug fix
2013-10-06 19:12:58 +00:00
repo_data_working2=$( grep -Eo '([^[:space:]]+://|[[:space:]]/).*' <<< $repo_line )
New version, tarball. Added urpmq for -r. Other distros than Mandriva, Mageia, no other changes so no need to update unless you want to. This adds support for Mandriva, Mageia. urpmq parsing is similar but not identical to pisi.
2013-10-05 01:40:00 +00:00
# then get the repo name string by slicing out the url string
repo_name=$( sed "s|[[:space:]]*$repo_data_working2||" <<< $repo_line )
repo_data_working="${repo_data_working}urpmq repo:$repo_name:$repo_data_working2\n"
fi
done <<< "$REPO_DATA"
# echo and execute the line breaks inserted
REPO_DATA="$( echo -e $repo_data_working )"
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
elif [[ -f $freebsd_conf ]];then
REPO_DATA="$( gawk -F '=' -v repoFile=$freebsd_conf '
BEGIN {
IGNORECASE=1
}
/^SERVERNAME/ {
print "BSD ports servers:" repoFile ":" $2
}
' $freebsd_conf )"
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
fi
added in some logging data
2010-01-09 04:17:22 +00:00
eval $LOGFE
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
}
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
get_runlevel_data()
{
eval $LOGFS
local runlvl=''
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p runlevel &>/dev/null;then
runlvl="$( runlevel | gawk '{ print $2 }' )"
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
fi
echo $runlvl
eval $LOGFE
}
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
# note: it appears that at least as of 2014-01-13, /etc/inittab is going to be used for
# default runlevel in upstart/sysvinit. systemd default is not always set so check to see
# if it's linked.
get_runlevel_default()
{
eval $LOGFS
local default_runlvl=''
local inittab='/etc/inittab'
local systemd_default='/etc/systemd/system/default.target'
local upstart_default='/etc/init/rc-sysinit.conf'
# note: systemd systems do not necessarily have this link created
if [[ -L $systemd_default ]];then
default_runlvl=$( readlink $systemd_default )
if [[ -n $default_runlvl ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
default_runlvl=${default_runlvl##*/}
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
fi
# http://askubuntu.com/questions/86483/how-can-i-see-or-change-default-run-level
# note that technically default can be changed at boot but for inxi purposes that does
# not matter, we just want to know the system default
elif [[ -e $upstart_default ]];then
# env DEFAULT_RUNLEVEL=2
default_runlvl=$( gawk -F '=' '/^env[[:space:]]+DEFAULT_RUNLEVEL/ {
print $2
bug fix, forgot to set upstart path
2014-01-13 23:17:26 +00:00
}' $upstart_default )
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
fi
# handle weird cases where null but inittab exists
if [[ -z $default_runlvl && -f $inittab ]];then
default_runlvl=$( gawk -F ':' '
/^id.*initdefault/ {
print $2
}' $inittab )
fi
echo $default_runlvl
eval $LOGFE
}
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
get_sensors_data()
{
eval $LOGFS
(change version) found and fixed bug in awk, the test ! i in array is not supported, you have to use only: i in array annoying, but that's life.
2010-01-08 00:51:34 +00:00
adding support, initial, for free xorg gpu temp output, first only for the newer radeons
2011-06-24 21:59:57 +00:00
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local a_temp=''
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
IFS=$'\n'
adding support, initial, for free xorg gpu temp output, first only for the newer radeons
2011-06-24 21:59:57 +00:00
if [[ -n $Sensors_Data ]];then
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
# note: non-configured sensors gives error message, which we need to redirect to stdout
(change version) More fine tuning of sensors. Handled case where temp 1 or 2 is greater than temp 2 or 1, but fan speed is zero for the hotter case, and is > 0 for the cooler case. This means that the cpu fan will be the cooler temp. Added an attempt to set mobo fan speed if fanx is > 5000k rpm, those little fans will always be fast and on mobo, or almost always.
2009-07-31 22:26:09 +00:00
# also, -F ':' no space, since some cases have the data starting right after,like - :1287
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
A_SENSORS_DATA=( $(
adding support, initial, for free xorg gpu temp output, first only for the newer radeons
2011-06-24 21:59:57 +00:00
gawk -F ':' -v userCpuNo="$SENSORS_CPU_NO" '
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
BEGIN {
IGNORECASE=1
core0Temp="" # only if all else fails...
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
cpuTemp=""
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
cpuTempReal=""
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
fanWorking=""
indexCountaFanMain=0
indexCountaFanDefault=0
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
i=""
j=""
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
moboTemp=""
moboTempReal=""
psuTemp=""
added variable declaration to sensors
2009-07-30 00:22:49 +00:00
separator=""
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
sysFanString=""
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
temp1=""
temp2=""
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
tempFanType="" # set to 1 or 2
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
tempUnit=""
tempWorking=""
tempWorkingUnit=""
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
bug fix
2011-06-24 22:18:37 +00:00
# new data arriving: gpu temp in sensors, have to skip that
updated sensors to handle gpu data more cleanly.
2011-06-25 17:08:57 +00:00
/^('"$SENSORS_GPU_SEARCH"')-pci/ {
bug fix
2011-06-24 22:18:37 +00:00
while ( getline && !/^$/ ) {
# do nothing, just skip it
}
}
tweaked comments in sensors section
2009-07-30 01:07:27 +00:00
# dumping the extra + signs after testing for them, nobody has negative temps.
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
# also, note gawk treats ° as a space, so we have to get the C/F data
tweaked comments in sensors section
2009-07-30 01:07:27 +00:00
# there are some guesses here, but with more sensors samples it will get closer.
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
# note: using arrays starting at 1 for all fan arrays to make it easier overall
tweaked comments in sensors section
2009-07-30 01:07:27 +00:00
# more validation because gensub if fails to get match returns full string, so
# we have to be sure we are working with the actual real string before assiging
# data to real variables and arrays. Extracting C/F degree unit as well to use
(change version) fixed very obscure gensub/gawk bug that makes integers into strings if 501-1000 when number is generated by gensub. This bug makes the number typed as string, which makes > tests always true. Also fixed output bug where there is nothing in main fan data, but there is something in default fan data array.
2009-08-05 00:56:27 +00:00
# when constructing temp items for array.
bug fix, since it's basically not possible to control charset of output consoles, removing the degree circle from sensors output. It failed on 8859-14, for example, but works on utf-8 and 8859-1, but rather than fight endless charset locales stuff it's easier to just dump it.
2009-08-03 04:48:29 +00:00
# note that because of charset issues, no tempUnit="°" tempWorkingUnit degree sign
# used, but it is required in testing regex to avoid error.
fixed small issues, added SIO to mobo temp types, filtered out ps from -t c for slower systems
2010-02-18 06:34:23 +00:00
/^(M\/B|MB|SIO|SYS)(.*)\+([0-9]+)(.*)[ \t°](C|F)/ && $2 ~ /^[ \t]*\+([0-9]+)/ {
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
moboTemp=gensub( /[ \t]+\+([0-9\.]*)(.*)/, "\\1", 1, $2 )
tempWorkingUnit=gensub( /[ \t]+\+([0-9\.]+)[ \t°]+([CF])(.*)/, "\\2", 1, $2 )
if ( tempWorkingUnit ~ /^C|F$/ && tempUnit == "" ){
bug fix, since it's basically not possible to control charset of output consoles, removing the degree circle from sensors output. It failed on 8859-14, for example, but works on utf-8 and 8859-1, but rather than fight endless charset locales stuff it's easier to just dump it.
2009-08-03 04:48:29 +00:00
tempUnit=tempWorkingUnit
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
}
}
/^CPU(.*)\+([0-9]+)(.*)[ \t°](C|F)/ && $2 ~ /^[ \t]*\+([0-9]+)/ {
cpuTemp=gensub( /[ \t]+\+([0-9\.]+)(.*)/, "\\1", 1, $2 )
tempWorkingUnit=gensub( /[ \t]+\+([0-9\.]+)[ \t°]+([CF])(.*)/, "\\2", 1, $2 )
if ( tempWorkingUnit ~ /^C|F$/ && tempUnit == "" ){
bug fix, since it's basically not possible to control charset of output consoles, removing the degree circle from sensors output. It failed on 8859-14, for example, but works on utf-8 and 8859-1, but rather than fight endless charset locales stuff it's easier to just dump it.
2009-08-03 04:48:29 +00:00
tempUnit=tempWorkingUnit
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
}
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
/^(P\/S|Power)(.*)\+([0-9]+)(.*)[ \t°](C|F)/ && $2 ~ /^[ \t]*\+([0-9]+)/ {
psuTemp=gensub( /[ \t]+\+([0-9\.]+)(.*)/, "\\1", 1, $2 )
tempWorkingUnit=gensub( /[ \t]+\+([0-9\.]+)[ \t°]+([CF])(.*)/, "\\2", 1, $2 )
if ( tempWorkingUnit ~ /^C|F$/ && tempUnit == "" ){
bug fix, since it's basically not possible to control charset of output consoles, removing the degree circle from sensors output. It failed on 8859-14, for example, but works on utf-8 and 8859-1, but rather than fight endless charset locales stuff it's easier to just dump it.
2009-08-03 04:48:29 +00:00
tempUnit=tempWorkingUnit
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
}
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
$1 ~ /^temp1$/ && $2 ~ /^[ \t]*\+([0-9]+)/ {
tempWorking=gensub( /[ \t]+\+([0-9\.]+)(.*)/, "\\1", 1, $2 )
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if ( temp1 == "" || tempWorking > 0 ) {
temp1=tempWorking
}
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
tempWorkingUnit=gensub( /[ \t]+\+([0-9\.]+)[ \t°]+([CF])(.*)/, "\\2", 1, $2 )
if ( tempWorkingUnit ~ /^C|F$/ && tempUnit == "" ){
bug fix, since it's basically not possible to control charset of output consoles, removing the degree circle from sensors output. It failed on 8859-14, for example, but works on utf-8 and 8859-1, but rather than fight endless charset locales stuff it's easier to just dump it.
2009-08-03 04:48:29 +00:00
tempUnit=tempWorkingUnit
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
}
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
$1 ~ /^temp2$/ && $2 ~ /^[ \t]*\+([0-9]+)/ {
tempWorking=gensub( /[ \t]+\+([0-9\.]+)(.*)/, "\\1", 1, $2 )
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if ( temp2 == "" || tempWorking > 0 ) {
temp2=tempWorking
}
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
tempWorkingUnit=gensub( /[ \t]+\+([0-9\.]+)[ \t°]+([CF])(.*)/, "\\2", 1, $2 )
if ( tempWorkingUnit ~ /^C|F$/ && tempUnit == "" ){
bug fix, since it's basically not possible to control charset of output consoles, removing the degree circle from sensors output. It failed on 8859-14, for example, but works on utf-8 and 8859-1, but rather than fight endless charset locales stuff it's easier to just dump it.
2009-08-03 04:48:29 +00:00
tempUnit=tempWorkingUnit
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
}
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
# final fallback if all else fails, funtoo user showed sensors putting
# temp on wrapped second line, not handled
small tweak to double check that only valid temp data gets used in regex
2009-07-30 01:00:24 +00:00
/^(core0|core 0)(.*)\+([0-9]+)(.*)[ \t°](C|F)/ && $2 ~ /^[ \t]*\+([0-9]+)/ {
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
tempWorking=gensub( /[ \t]+\+([0-9\.]+)(.*)/, "\\1", 1, $2 )
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if ( core0Temp == "" || tempWorking > 0 ) {
core0Temp=tempWorking
}
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
tempWorkingUnit=gensub( /[ \t]+\+([0-9\.]+)[ \t°]+([CF])(.*)/, "\\2", 1, $2 )
if ( tempWorkingUnit ~ /^C|F$/ && tempUnit == "" ){
bug fix, since it's basically not possible to control charset of output consoles, removing the degree circle from sensors output. It failed on 8859-14, for example, but works on utf-8 and 8859-1, but rather than fight endless charset locales stuff it's easier to just dump it.
2009-08-03 04:48:29 +00:00
tempUnit=tempWorkingUnit
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
}
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
# note: can be cpu fan:, cpu fan speed:, etc. Some cases have no space before
tweaked comments in sensors section
2009-07-30 01:07:27 +00:00
# $2 starts (like so :1234 RPM), so skip that space test in regex
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
/^CPU(.*)[ \t]*([0-9]+)[ \t]RPM/ {
aFanMain[1]=gensub( /[ \t]*([0-9]+)[ \t]+(.*)/, "\\1", 1, $2 )
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
/^(M\/B|MB|SYS)(.*)[ \t]*([0-9]+)[ \t]RPM/ {
aFanMain[2]=gensub( /[ \t]*([0-9]+)[ \t]+(.*)/, "\\1", 1, $2 )
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
/(Power|P\/S|POWER)(.*)[ \t]*([0-9]+)[ \t]RPM/ {
aFanMain[3]=gensub( /[ \t]*([0-9]+)[ \t]+(.*)/, "\\1", 1, $2 )
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
(change version) fixed fan speed output for fringe cases, also fixed possible overwrite of fan speeds. the fan output isn't perfect though, but it will do for now.
2010-01-07 23:59:16 +00:00
# note that the counters are dynamically set for fan numbers here
# otherwise you could overwrite eg aux fan2 with case fan2 in theory
# note: cpu/mobo/ps are 1/2/3
(change version) found and fixed bug in awk, the test ! i in array is not supported, you have to use only: i in array annoying, but that's life.
2010-01-08 00:51:34 +00:00
# NOTE: test: ! i in array does NOT work, this appears to be an awk/gawk bug
(change version) fixed fan speed output for fringe cases, also fixed possible overwrite of fan speeds. the fan output isn't perfect though, but it will do for now.
2010-01-07 23:59:16 +00:00
/^(AUX(1)? |CASE(1)? |CHASSIS(1)? )(.*)[ \t]*([0-9]+)[ \t]RPM/ {
for ( i = 4; i < 7; i++ ){
(change version) found and fixed bug in awk, the test ! i in array is not supported, you have to use only: i in array annoying, but that's life.
2010-01-08 00:51:34 +00:00
if ( i in aFanMain ){
##
}
else {
aFanMain[i]=gensub( /[ \t]*([0-9]+)[ \t]+(.*)/, "\\1", 1, $2 )
(change version) fixed fan speed output for fringe cases, also fixed possible overwrite of fan speeds. the fan output isn't perfect though, but it will do for now.
2010-01-07 23:59:16 +00:00
break
}
}
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
(change version) fixed fan speed output for fringe cases, also fixed possible overwrite of fan speeds. the fan output isn't perfect though, but it will do for now.
2010-01-07 23:59:16 +00:00
/^(AUX([2-9]) |CASE([2-9]) |CHASSIS([2-9]) )(.*)[ \t]*([0-9]+)[ \t]RPM/ {
for ( i = 5; i < 30; i++ ){
(change version) found and fixed bug in awk, the test ! i in array is not supported, you have to use only: i in array annoying, but that's life.
2010-01-08 00:51:34 +00:00
if ( i in aFanMain ) {
##
}
else {
(change version) fixed fan speed output for fringe cases, also fixed possible overwrite of fan speeds. the fan output isn't perfect though, but it will do for now.
2010-01-07 23:59:16 +00:00
sysFanNu = i
(change version) found and fixed bug in awk, the test ! i in array is not supported, you have to use only: i in array annoying, but that's life.
2010-01-08 00:51:34 +00:00
aFanMain[i]=gensub( /[ \t]*([0-9]+)[ \t]+(.*)/, "\\1", 1, $2 )
(change version) fixed fan speed output for fringe cases, also fixed possible overwrite of fan speeds. the fan output isn't perfect though, but it will do for now.
2010-01-07 23:59:16 +00:00
break
}
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
}
(change version) fixed fan speed output for fringe cases, also fixed possible overwrite of fan speeds. the fan output isn't perfect though, but it will do for now.
2010-01-07 23:59:16 +00:00
# in rare cases syntax is like: fan1: xxx RPM
/^(FAN(1)?[ \t:])(.*)[ \t]*([0-9]+)[ \t]RPM/ {
aFanDefault[1]=gensub( /[ \t]*([0-9]+)[ \t]+(.*)/, "\\1", 1, $2 )
}
/^FAN([2-9]|1[0-9])(.*)[ \t]*([0-9]+)[ \t]RPM/ {
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
fanWorking=gensub( /[ \t]*([0-9]+)[ \t]+(.*)/, "\\1", 1, $2 )
sysFanNu=gensub( /fan([0-9]+)/, "\\1", 1, $1 )
if ( sysFanNu ~ /^([0-9]+)$/ ) {
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
# add to array if array index does not exist OR if number is > existing number
(change version) found and fixed bug in awk, the test ! i in array is not supported, you have to use only: i in array annoying, but that's life.
2010-01-08 00:51:34 +00:00
if ( sysFanNu in aFanDefault ) {
if ( fanWorking >= aFanDefault[sysFanNu] ) {
aFanDefault[sysFanNu]=fanWorking
}
}
else {
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
aFanDefault[sysFanNu]=fanWorking
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
}
}
END {
# first we need to handle the case where we have to determine which temp/fan to use for cpu and mobo:
# note, for rare cases of weird cool cpus, user can override in their prefs and force the assignment
if ( temp1 != "" && temp2 != "" ){
if ( userCpuNo != "" && userCpuNo ~ /(1|2)/ ) {
tempFanType=userCpuNo
}
else {
(change version) More fine tuning of sensors. Handled case where temp 1 or 2 is greater than temp 2 or 1, but fan speed is zero for the hotter case, and is > 0 for the cooler case. This means that the cpu fan will be the cooler temp. Added an attempt to set mobo fan speed if fanx is > 5000k rpm, those little fans will always be fast and on mobo, or almost always.
2009-07-31 22:26:09 +00:00
# first some fringe cases with cooler cpu than mobo: assume which is cpu temp based on fan speed
# but only if other fan speed is 0
if ( temp1 >= temp2 && 1 in aFanDefault && 2 in aFanDefault && aFanDefault[1] == 0 && aFanDefault[2] > 0 ) {
tempFanType=2
}
else if ( temp2 >= temp1 && 1 in aFanDefault && 2 in aFanDefault && aFanDefault[2] == 0 && aFanDefault[1] > 0 ) {
tempFanType=1
}
# then handle the standard case if these fringe cases are false
else if ( temp1 >= temp2 ) {
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
tempFanType=1
}
else {
tempFanType=2
}
}
}
# need a case for no temps at all reported, like with old intels
tweaks
2010-02-18 06:57:47 +00:00
else if ( temp2 == "" && cpuTemp == "" ){
if ( temp1 == "" && moboTemp == "" ){
tempFanType=1
}
else if ( temp1 != "" && moboTemp == "" ){
tempFanType=1
}
else if ( temp1 != "" && moboTemp != "" ){
tempFanType=1
}
small tweak
2010-02-18 06:53:49 +00:00
}
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
# then get the real cpu temp, best guess is hottest is real
if ( cpuTemp != "" ){
cpuTempReal=cpuTemp
}
else if ( tempFanType != "" ){
if ( tempFanType == 1 ){
cpuTempReal=temp1
}
else {
cpuTempReal=temp2
}
}
else {
cpuTempReal=temp1
}
# if all else fails, use core0 temp if it is present and cpu is null
if ( cpuTempReal == "" && core0Temp != "" ) {
cpuTempReal=core0Temp
}
(change version) bug fix for cpu data. Make sure all cpu counts are > 1 for tests.
2009-08-05 00:26:28 +00:00
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
# then the real mobo temp
if ( moboTemp != "" ){
moboTempReal=moboTemp
}
else if ( tempFanType != "" ){
if ( tempFanType == 1 ) {
moboTempReal=temp2
}
else {
moboTempReal=temp1
}
}
else {
moboTempReal=temp2
}
# then set the cpu fan speed
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
if ( aFanMain[1] == "" ) {
# note, you cannot test for aFanDefault[1] or [2] != ""
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
# because that creates an array item in gawk just by the test itself
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
if ( tempFanType == 1 && 1 in aFanDefault ) {
aFanMain[1]=aFanDefault[1]
(change version) bug fix for cpu data. Make sure all cpu counts are > 1 for tests.
2009-08-05 00:26:28 +00:00
aFanDefault[1]=""
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
else if ( tempFanType == 2 && 2 in aFanDefault ) {
aFanMain[1]=aFanDefault[2]
(change version) bug fix for cpu data. Make sure all cpu counts are > 1 for tests.
2009-08-05 00:26:28 +00:00
aFanDefault[2]=""
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
}
# then we need to get the actual numeric max array count for both fan arrays
(change version) found and fixed bug in awk, the test ! i in array is not supported, you have to use only: i in array annoying, but that's life.
2010-01-08 00:51:34 +00:00
for (i = 0; i <= 29; i++) {
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
if ( i in aFanMain && i > indexCountaFanMain ) {
indexCountaFanMain=i
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
}
for (i = 0; i <= 14; i++) {
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
if ( i in aFanDefault && i > indexCountaFanDefault ) {
indexCountaFanDefault=i
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
}
# clear out any duplicates. Primary fan real trumps fan working always if same speed
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
for (i = 1; i <= indexCountaFanMain; i++) {
if ( i in aFanMain && aFanMain[i] != "" && aFanMain[i] != 0 ) {
for (j = 1; j <= indexCountaFanDefault; j++) {
if ( j in aFanDefault && aFanMain[i] == aFanDefault[j] ) {
aFanDefault[j] = ""
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
}
(change version) More fine tuning of sensors. Handled case where temp 1 or 2 is greater than temp 2 or 1, but fan speed is zero for the hotter case, and is > 0 for the cooler case. This means that the cpu fan will be the cooler temp. Added an attempt to set mobo fan speed if fanx is > 5000k rpm, those little fans will always be fast and on mobo, or almost always.
2009-07-31 22:26:09 +00:00
}
}
(change version) bug fix for cpu data. Make sure all cpu counts are > 1 for tests.
2009-08-05 00:26:28 +00:00
(change version) More fine tuning of sensors. Handled case where temp 1 or 2 is greater than temp 2 or 1, but fan speed is zero for the hotter case, and is > 0 for the cooler case. This means that the cpu fan will be the cooler temp. Added an attempt to set mobo fan speed if fanx is > 5000k rpm, those little fans will always be fast and on mobo, or almost always.
2009-07-31 22:26:09 +00:00
# now see if you can find the fast little mobo fan, > 5000 rpm and put it as mobo
(change version) bug fix for cpu data. Make sure all cpu counts are > 1 for tests.
2009-08-05 00:26:28 +00:00
# note that gawk is returning true for some test cases when aFanDefault[j] < 5000
# which has to be a gawk bug, unless there is something really weird with arrays
# note: 500 > aFanDefault[j] < 1000 is the exact trigger, and if you manually
# assign that value below, the > 5000 test works again, and a print of the value
(change version) fixed very obscure gensub/gawk bug that makes integers into strings if 501-1000 when number is generated by gensub. This bug makes the number typed as string, which makes > tests always true. Also fixed output bug where there is nothing in main fan data, but there is something in default fan data array.
2009-08-05 00:56:27 +00:00
# shows the proper value, so the corruption might be internal in awk.
# Note: gensub is the culprit I think, assigning type string for range 501-1000 but
# type integer for all others, this triggers true for >
(change version) More fine tuning of sensors. Handled case where temp 1 or 2 is greater than temp 2 or 1, but fan speed is zero for the hotter case, and is > 0 for the cooler case. This means that the cpu fan will be the cooler temp. Added an attempt to set mobo fan speed if fanx is > 5000k rpm, those little fans will always be fast and on mobo, or almost always.
2009-07-31 22:26:09 +00:00
for (j = 1; j <= indexCountaFanDefault; j++) {
(change version) fixed very obscure gensub/gawk bug that makes integers into strings if 501-1000 when number is generated by gensub. This bug makes the number typed as string, which makes > tests always true. Also fixed output bug where there is nothing in main fan data, but there is something in default fan data array.
2009-08-05 00:56:27 +00:00
if ( j in aFanDefault && int( aFanDefault[j] ) > 5000 && aFanMain[2] == "" ) {
(change version) More fine tuning of sensors. Handled case where temp 1 or 2 is greater than temp 2 or 1, but fan speed is zero for the hotter case, and is > 0 for the cooler case. This means that the cpu fan will be the cooler temp. Added an attempt to set mobo fan speed if fanx is > 5000k rpm, those little fans will always be fast and on mobo, or almost always.
2009-07-31 22:26:09 +00:00
aFanMain[2] = aFanDefault[j]
aFanDefault[j] = ""
# then add one if required for output
if ( indexCountaFanMain < 2 ) {
indexCountaFanMain = 2
}
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
}
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
(change version) bug fix for cpu data. Make sure all cpu counts are > 1 for tests.
2009-08-05 00:26:28 +00:00
# then construct the sys_fan string for echo, note that iteration 1
# makes: fanDefaultString separator null, ie, no space or ,
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
for (j = 1; j <= indexCountaFanDefault; j++) {
fanDefaultString = fanDefaultString separator aFanDefault[j]
separator=","
}
separator="" # reset to null for next loop
# then construct the sys_fan string for echo
for (j = 1; j <= indexCountaFanMain; j++) {
fanMainString = fanMainString separator aFanMain[j]
separator=","
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
# and then build the temps:
if ( moboTempReal != "" ) {
moboTempReal = moboTempReal tempUnit
}
if ( cpuTempReal != "" ) {
cpuTempReal = cpuTempReal tempUnit
}
# if they are ALL null, print error message. psFan is not used in output currently
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
if ( cpuTempReal == "" && moboTempReal == "" && aFanMain[1] == "" && aFanMain[2] == "" && aFanMain[3] == "" && fanDefaultString == "" ) {
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
print "No active sensors found. Have you configured your sensors yet?"
}
else {
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
# then build array arrays:
print cpuTempReal "," moboTempReal "," psuTemp
# this is for output, a null print line does NOT create a new array index in bash
(change version) fixed very obscure gensub/gawk bug that makes integers into strings if 501-1000 when number is generated by gensub. This bug makes the number typed as string, which makes > tests always true. Also fixed output bug where there is nothing in main fan data, but there is something in default fan data array.
2009-08-05 00:56:27 +00:00
if ( fanMainString == "" ) {
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
fanMainString=","
}
print fanMainString
print fanDefaultString
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
}' <<< "$Sensors_Data" ) )
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
fi
IFS="$ORIGINAL_IFS"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_SENSORS_DATA[@]}
log_function_data "A_SENSORS_DATA: $a_temp"
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
# echo "A_SENSORS_DATA: ${A_SENSORS_DATA[@]}"
eval $LOGFE
}
adding support, initial, for free xorg gpu temp output, first only for the newer radeons
2011-06-24 21:59:57 +00:00
get_sensors_output()
{
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
local sensors_data=''
added newlines to sensors output to make sure sensors always work
2011-06-25 04:08:13 +00:00
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
if type -p sensors &>/dev/null;then
sensors_data="$( sensors 2>/dev/null )"
added newlines to sensors output to make sure sensors always work
2011-06-25 04:08:13 +00:00
if [[ -n "$sensors_data" ]];then
fixed a small glitch with sensors data, it needs a character string after the newlines for the newline to work properly due to how bash deals with null lines after end of content.
2011-07-20 21:25:12 +00:00
# make sure the file ends in newlines then characters, the newlines are lost in the echo unless
# the data ends in some characters
sensors_data="$sensors_data\n\n###"
added newlines to sensors output to make sure sensors always work
2011-06-25 04:08:13 +00:00
fi
adding support, initial, for free xorg gpu temp output, first only for the newer radeons
2011-06-24 21:59:57 +00:00
fi
added newlines to sensors output to make sure sensors always work
2011-06-25 04:08:13 +00:00
echo -e "$sensors_data"
adding support, initial, for free xorg gpu temp output, first only for the newer radeons
2011-06-24 21:59:57 +00:00
}
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
get_shell_data()
{
eval $LOGFS
local shell_type="$( ps -p $PPID -o comm= 2>/dev/null )"
New version, new tarball, new man page. Fixed an old bug where if you start inxi with an ssh command sometimes it will not show any client information, just the debugger PPID output. Now it will test as a final check to see if it can detect any parent to the process. Actually grandparent I believe. Seems to work, it's a fringe case but why not handle it? New -xx feature, for -I it will show, if inxi is not running in IRC client and if is running in X, and if the grandparent is not 'login', will show the application the shell is running in. Example: Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3 Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6 Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
2013-01-29 00:03:06 +00:00
local shell_version=''
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
if [[ $B_EXTRA_DATA == 'true' && -n $shell_type ]];then
case $shell_type in
bash)
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
shell_version=$( get_program_version "$shell_type" "^GNU[[:space:]]bash,[[:space:]]version" "4" | \
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
sed $SED_RX 's/(\(.*|-release|-version)//' )
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
;;
# csh/dash use dpkg package version data, debian/buntu only
csh)
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
shell_version=$( get_program_version "$shell_type" "^tcsh" "2" )
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
;;
dash)
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
shell_version=$( get_program_version "$shell_type" "$shell_type" "3" )
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
;;
ksh)
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
shell_version=$( get_program_version "$shell_type" "version" "5" )
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
;;
tcsh)
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
shell_version=$( get_program_version "$shell_type" "^tcsh" "2" )
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
;;
zsh)
New version; added supybot/limnoria/gribble support. This only works when the supybot 'SHELL' command is used, 'CALL' gives the user irc client data, and supybot etc are not detectable. Fine tuned some error message lengths so they fit into 80 columns or so.
2014-03-25 20:56:58 +00:00
shell_version=$( get_program_version "$shell_type" "^zsh" "2" )
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
;;
esac
fi
if [[ -n $shell_version ]];then
shell_type="$shell_type $shell_version"
fi
echo $shell_type
eval $LOGFS
}
New version, new tarball, new man page. Fixed an old bug where if you start inxi with an ssh command sometimes it will not show any client information, just the debugger PPID output. Now it will test as a final check to see if it can detect any parent to the process. Actually grandparent I believe. Seems to work, it's a fringe case but why not handle it? New -xx feature, for -I it will show, if inxi is not running in IRC client and if is running in X, and if the grandparent is not 'login', will show the application the shell is running in. Example: Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3 Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6 Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
2013-01-29 00:03:06 +00:00
get_shell_parent()
{
eval $LOGFS
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
local shell_parent='' script_parent=''
New version, new tarball, new man page. Fixed an old bug where if you start inxi with an ssh command sometimes it will not show any client information, just the debugger PPID output. Now it will test as a final check to see if it can detect any parent to the process. Actually grandparent I believe. Seems to work, it's a fringe case but why not handle it? New -xx feature, for -I it will show, if inxi is not running in IRC client and if is running in X, and if the grandparent is not 'login', will show the application the shell is running in. Example: Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3 Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6 Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
2013-01-29 00:03:06 +00:00
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
# removed --no-headers to make bsd safe, adding in -j to make output the same
script_parent=$( ps -j -fp $PPID 2>/dev/null | gawk '/'"$PPID"'/ { print $3 }' )
log_function_data "script parent: $script_parent"
shell_parent=$( ps -j -p $script_parent 2>/dev/null | gawk '/'"$script_parent"'/ { print $NF}' )
added a comment to explain the hack for su/process grandparent
2013-01-29 00:37:01 +00:00
# no idea why have to do script_parent action twice in su case, but you do, oh well.
quick bug fix, no version changes, handling su return value for shell parent, weird stuff. Now will drill in until it hopefully gets su parent.
2013-01-29 00:30:34 +00:00
if [[ $shell_parent == 'su' ]];then
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
script_parent=$( ps -j -fp $script_parent 2>/dev/null | gawk '/'"$script_parent"'/ { print $3 }' )
script_parent=$( ps -j -fp $script_parent 2>/dev/null | gawk '/'"$script_parent"'/ { print $3 }' )
shell_parent=$( ps -j -p $script_parent 2>/dev/null | gawk '/'"$script_parent"'/ { print $NF}' )
quick bug fix, no version changes, handling su return value for shell parent, weird stuff. Now will drill in until it hopefully gets su parent.
2013-01-29 00:30:34 +00:00
fi
New version, new tarball, new man page. Fixed an old bug where if you start inxi with an ssh command sometimes it will not show any client information, just the debugger PPID output. Now it will test as a final check to see if it can detect any parent to the process. Actually grandparent I believe. Seems to work, it's a fringe case but why not handle it? New -xx feature, for -I it will show, if inxi is not running in IRC client and if is running in X, and if the grandparent is not 'login', will show the application the shell is running in. Example: Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3 Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6 Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
2013-01-29 00:03:06 +00:00
echo $shell_parent
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
log_function_data "shell parent final: $shell_parent"
New version, new tarball, new man page. Fixed an old bug where if you start inxi with an ssh command sometimes it will not show any client information, just the debugger PPID output. Now it will test as a final check to see if it can detect any parent to the process. Actually grandparent I believe. Seems to work, it's a fringe case but why not handle it? New -xx feature, for -I it will show, if inxi is not running in IRC client and if is running in X, and if the grandparent is not 'login', will show the application the shell is running in. Example: Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3 Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6 Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
2013-01-29 00:03:06 +00:00
eval $LOGFE
}
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
# this will be used for some bsd data types
# args: $1 - option type
get_sysctl_data()
{
eval $LOGFS
local sysctl_data=''
if [[ $B_SYSCTL ]];then
sysctl_data="$( sysctl -$1 )"
fi
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
# log_function_data "sysctl_data: $sysctl_data"
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
echo "$sysctl_data"
eval $LOGFE
}
get_tty_console_irc()
{
eval $LOGFS
local tty_number=''
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ -n $IRC_CLIENT ]];then
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
tty_number=$( gawk '
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
BEGIN {
IGNORECASE=1
}
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
# if multiple irc clients open, can give wrong results
# so make sure to also use the PPID number to get the right tty
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
/.*'$PPID'.*'$IRC_CLIENT'/ {
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
gsub(/[^0-9]/, "", $7)
print $7
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
exit
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
}' <<< "$Ps_aux_Data" )
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
fi
log_function_data "tty_number: $tty_number"
echo $tty_number
eval $LOGFE
}
get_tty_number()
{
eval $LOGFS
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local tty_number=$( tty 2>/dev/null | sed 's/[^0-9]*//g' )
tty_number=${tty_number##*/}
echo ${tty_number##*/}
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
eval $LOGFE
}
and put the functions in alphabetical order, all done now.
2010-01-09 04:19:15 +00:00
get_unmounted_partition_data()
{
eval $LOGFS
New version, updated man page. A bug fix for an old time bug: with mdraid, -o (unmounted partitions) would show components of the md raid array as unmounted partitions. This is of course incorrect, and is now fixed. Small update of man page as well to note that -o will not show components of mdraid arrays.
2013-02-28 06:12:04 +00:00
local a_unmounted_working='' mounted_partitions='' separator='|' unmounted_fs=''
local dev_working='' uuid_working='' label_working='' a_raid_working='' raid_partitions=''
and put the functions in alphabetical order, all done now.
2010-01-09 04:19:15 +00:00
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
if [[ $B_PARTITIONS_FILE == 'true' ]];then
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
# set dev disk label/uuid data globals
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
get_partition_dev_data 'label'
get_partition_dev_data 'uuid'
New version, updated man page. A bug fix for an old time bug: with mdraid, -o (unmounted partitions) would show components of the md raid array as unmounted partitions. This is of course incorrect, and is now fixed. Small update of man page as well to note that -o will not show components of mdraid arrays.
2013-02-28 06:12:04 +00:00
# load the raid data array here so we can exclude its partitions
if [[ $B_RAID_SET != 'true' ]];then
get_raid_data
fi
# sr0 type cd drives are showing up now as unmounted partitions
small change, new tarball, added some excludes items to unmounted list, scd, dvdrw, cdrw.
2013-02-28 06:27:40 +00:00
mounted_partitions="scd[0-9]+|sr[0-9]+|cdrom[0-9]*|cdrw[0-9]*|dvd[0-9]*|dvdrw[0-9]*"
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
# create list for slicing out the mounted partitions
for (( i=0; i < ${#A_PARTITION_DATA[@]}; i++ ))
do
IFS=","
a_unmounted_working=( ${A_PARTITION_DATA[i]} )
IFS="$ORIGINAL_IFS"
if [[ -n ${a_unmounted_working[6]} ]];then
mounted_partitions="$mounted_partitions$separator${a_unmounted_working[6]}"
New version, updated man page. A bug fix for an old time bug: with mdraid, -o (unmounted partitions) would show components of the md raid array as unmounted partitions. This is of course incorrect, and is now fixed. Small update of man page as well to note that -o will not show components of mdraid arrays.
2013-02-28 06:12:04 +00:00
fi
done
# now we need to exclude the mdraid partitions from the unmounted partition output as well
for (( i=0; i < ${#A_RAID_DATA[@]}; i++ ))
do
IFS=","
a_raid_working=( ${A_RAID_DATA[i]} )
IFS="$ORIGINAL_IFS"
if [[ -n ${a_raid_working[3]} ]];then
raid_partitions=$( sed $SED_RX 's/(\([^\)]*\)|\[[^\]]*\])//g' <<< ${a_raid_working[3]}\
| sed 's/[[:space:]]\+/|/g' )
mounted_partitions="$mounted_partitions$separator$raid_partitions"
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
fi
done
New version, updated man page. A bug fix for an old time bug: with mdraid, -o (unmounted partitions) would show components of the md raid array as unmounted partitions. This is of course incorrect, and is now fixed. Small update of man page as well to note that -o will not show components of mdraid arrays.
2013-02-28 06:12:04 +00:00
A_UNMOUNTED_PARTITION_DATA=( $( grep -Ev '[[:space:]]('$mounted_partitions')$' $FILE_PARTITIONS | gawk '
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
BEGIN {
IGNORECASE=1
}
# note that size 1 means it is a logical extended partition container
(change version) Added in support for unmounted lvm type syntax in unmounted partitions function, /dev/dm-1, I forgot about that possibiliity. Fixed/patched hfs detection based on a file -s sample data chunk. Added hfsj, which I assume is hfs+, who knows for sure.
2010-01-14 20:46:59 +00:00
# lvm might have dm-1 type syntax
bug fix, -o also requires a loop type fs filter to avoid showing squashfs type partitions
2010-06-11 04:04:40 +00:00
# need to exclude loop type file systems, squashfs for example
/[a-z][0-9]+$|dm-[0-9]+$/ && $3 != 1 && $NF !~ /loop/ {
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
size = sprintf( "%.2f", $3*1024/1000**3 )
print $4 "," size "G"
}' ) )
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
for (( i=0; i < ${#A_UNMOUNTED_PARTITION_DATA[@]}; i++ ))
do
IFS=","
a_unmounted_working=( ${A_UNMOUNTED_PARTITION_DATA[i]} )
IFS="$ORIGINAL_IFS"
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
label_working=$( grep -E "${a_unmounted_working[0]}$" <<< "$DEV_DISK_LABEL" | gawk '{
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
print $(NF - 2)
}' )
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
uuid_working=$( grep -E "${a_unmounted_working[0]}$" <<< "$DEV_DISK_UUID" | gawk '{
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
print $(NF - 2)
}' )
added file system type for unmounted fs, if available. Uses file -s, can add it to sudoers if you want to run it as regular user.
2010-01-09 19:20:40 +00:00
unmounted_fs=$( get_unmounted_partition_filesystem "/dev/${a_unmounted_working[0]}" )
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
IFS=","
added file system type for unmounted fs, if available. Uses file -s, can add it to sudoers if you want to run it as regular user.
2010-01-09 19:20:40 +00:00
A_UNMOUNTED_PARTITION_DATA[i]=${a_unmounted_working[0]}","${a_unmounted_working[1]}","$label_working","$uuid_working","$unmounted_fs
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
IFS="$ORIGINAL_IFS"
done
fi
fixed a weird arch kernel issue where df -hT reports first column /dev/disk/by-uuid no matter how disk is mounted in reality.
2010-09-16 21:10:33 +00:00
# echo "${A_PARTITION_DATA[@]}"
and put the functions in alphabetical order, all done now.
2010-01-09 04:19:15 +00:00
# echo "${A_UNMOUNTED_PARTITION_DATA[@]}"
eval $LOGFE
}
added file system type for unmounted fs, if available. Uses file -s, can add it to sudoers if you want to run it as regular user.
2010-01-09 19:20:40 +00:00
# a few notes, normally file -s requires root, but you can set user rights in /etc/sudoers.
# list of file systems: http://en.wikipedia.org/wiki/List_of_file_systems
# args: $1 - /dev/<disk><part> to be tested for
get_unmounted_partition_filesystem()
{
eval $LOGFS
local partition_filesystem='' sudo_command=''
(Change Version) Optimized to not do repeated tests of tools for functions that are used more than one time. Added boolean tested flags, and global app path variables to handle this. this can knock off up to 10 or more type -p app exists type tests for one script execution.
2010-01-29 23:31:20 +00:00
if [[ $B_FILE_TESTED != 'true' ]];then
B_FILE_TESTED='true'
FILE_PATH=$( type -p file )
fi
if [[ $B_SUDO_TESTED != 'true' ]];then
B_SUDO_TESTED='true'
SUDO_PATH=$( type -p sudo )
fi
if [[ -n $FILE_PATH && -n $1 ]];then
added file system type for unmounted fs, if available. Uses file -s, can add it to sudoers if you want to run it as regular user.
2010-01-09 19:20:40 +00:00
# only use sudo if not root, -n option requires sudo -V 1.7 or greater. sudo will just error out
# which is the safest course here for now, otherwise that interactive sudo password thing is too annoying
# important: -n makes it non interactive, no prompt for password
(Change Version) Optimized to not do repeated tests of tools for functions that are used more than one time. Added boolean tested flags, and global app path variables to handle this. this can knock off up to 10 or more type -p app exists type tests for one script execution.
2010-01-29 23:31:20 +00:00
if [[ $B_ROOT != 'true' && -n $SUDO_PATH ]];then
added file system type for unmounted fs, if available. Uses file -s, can add it to sudoers if you want to run it as regular user.
2010-01-09 19:20:40 +00:00
sudo_command='sudo -n '
fi
# this will fail if regular user and no sudo present, but that's fine, it will just return null
# note the hack that simply slices out the first line if > 1 items found in string
fixed a bug where if disk has > 9 partions, label would repeat for root for all of them > 9
2010-09-26 21:59:16 +00:00
# also, if grub/lilo is on partition boot sector, no file system data is available
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
# BSD fix: -Eio -Em 1
(Change Version) Optimized to not do repeated tests of tools for functions that are used more than one time. Added boolean tested flags, and global app path variables to handle this. this can knock off up to 10 or more type -p app exists type tests for one script execution.
2010-01-29 23:31:20 +00:00
partition_filesystem=$( eval $sudo_command $FILE_PATH -s $1 | grep -Eio '(ext2|ext3|ext4|ext5|ext[[:space:]]|ntfs|fat32|fat16|fat[[:space:]]\(.*\)|vfat|fatx|tfat|swap|btrfs|ffs[[:space:]]|hfs\+|hfs[[:space:]]plus|hfs[[:space:]]extended[[:space:]]version[[:space:]][1-9]|hfsj|hfs[[:space:]]|jfs[[:space:]]|nss[[:space:]]|reiserfs|reiser4|ufs2|ufs[[:space:]]|xfs[[:space:]]|zfs[[:space:]])' | grep -Em 1 '.*' )
added file system type for unmounted fs, if available. Uses file -s, can add it to sudoers if you want to run it as regular user.
2010-01-09 19:20:40 +00:00
if [[ -n $partition_filesystem ]];then
echo $partition_filesystem
fi
fi
eval $LOGFE
}
More refactoring, made short output use the new cpu_core_count function, got rid of CPU2 stuff, commented out chunks of now unneeded get cpu data stuff More clean up, tightened up print functions, added some more locals in main print function for child data, removed corresponding globals.
2008-10-30 21:23:29 +00:00
## return uptime string
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
get_uptime()
refactored and ordered get data functions
2008-10-30 05:04:11 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
tweaked uptime output, added dash, removed space
2008-10-31 01:34:51 +00:00
## note: removing gsub(/ /,"",a); to get get space back in there, goes right before print a
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
local uptime_value="$( uptime | gawk '{
cleanup, no changes
2009-02-05 01:51:34 +00:00
a = gensub(/^.*up *([^,]*).*$/,"\\1","g",$0)
print a
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
}' )"
echo "$uptime_value"
log_function_data "uptime_value: $uptime_value"
eval $LOGFE
refactored and ordered get data functions
2008-10-30 05:04:11 +00:00
}
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
get_weather_data()
{
eval $LOGFS
local location_site='http://geoip.ubuntu.com/lookup'
local weather_feed='http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query='
local weather_spider='http://wunderground.com/'
new version, new tarball, bug fix for weather
2013-05-18 04:11:18 +00:00
local data_grab_error='' wget_error=0
bug fix, forgot to remove debugging flag
2013-05-18 04:13:09 +00:00
local b_test_loc=false b_test_weather=false b_debug=false
new tarball, version, bug fixes on weather, also optimized speed for slow isps, and added a global that can be set in user / system configs to make a longer wget time out. Default is 8 seconds. This should take care of the failure from slow load issue reported.
2013-05-18 05:14:27 +00:00
local test_dir="$HOME/bin/scripts/inxi/data/weather/"
new version, new tarball, bug fix for weather
2013-05-18 04:11:18 +00:00
local test_location='location2.xml' test_weather='weather-feed.xml'
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
local location_data='' location='' weather_data='' location_array_value='' a_location=''
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local weather_array_value='' site_elevation='' a_temp=''
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
# first we get the location data, once that is parsed and handled, we move to getting the
# actual weather data, assuming no errors
if [[ -n $ALTERNATE_WEATHER_LOCATION ]];then
New version, new tarball. Fixed some lintian issues in man page, changed man/help for -! location= option, to indicate that users must replace space with + themselves. Because of how bash handles these options, inxi cannot add in + signs itself automatically. This should be closer to cleanup of this new feature.
2013-05-18 17:52:16 +00:00
# note, this api does not support spaces in names, replace spaces with + sign.
new version, tarball. Fixed issue with spaces in names for cities/states/countries, added man and help instructions to remove spaces and examples.
2013-05-18 05:37:29 +00:00
location=$ALTERNATE_WEATHER_LOCATION
New version, new tarball. Fixed some lintian issues in man page, changed man/help for -! location= option, to indicate that users must replace space with + themselves. Because of how bash handles these options, inxi cannot add in + signs itself automatically. This should be closer to cleanup of this new feature.
2013-05-18 17:52:16 +00:00
# echo $ALTERNATE_WEATHER_LOCATION;exit
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
else
new version, new tarball, bug fix for weather
2013-05-18 04:11:18 +00:00
if [[ $b_test_loc != 'true' ]];then
new tarball, version, bug fixes on weather, also optimized speed for slow isps, and added a global that can be set in user / system configs to make a longer wget time out. Default is 8 seconds. This should take care of the failure from slow load issue reported.
2013-05-18 05:14:27 +00:00
location_data=$( wget -q -t 1 -T $WGET_TIMEOUT -O- $location_site || wget_error=$? )
log_function_data "$location_data"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
if [[ $wget_error -ne 0 ]];then
data_grab_error="Error: location server up but download error - wget: $wget_error"
fi
patch 2, trying to speed up for slow connection the weather tests
2013-05-18 04:49:36 +00:00
wget_error=0
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
else
new tarball, version, bug fixes on weather, also optimized speed for slow isps, and added a global that can be set in user / system configs to make a longer wget time out. Default is 8 seconds. This should take care of the failure from slow load issue reported.
2013-05-18 05:14:27 +00:00
if [[ -f $test_dir$test_location ]];then
location_data="$( cat $test_dir$test_location )"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
else
data_grab_error="Error: location xml local file not found."
fi
fi
trying a patch fix for slow remote connections
2013-05-18 04:37:24 +00:00
if [[ -n $data_grab_error ]];then
:
elif [[ -z $( grep -i '<Response' <<< $location_data ) ]];then
new version, new tarball, bug fix for weather
2013-05-18 04:11:18 +00:00
data_grab_error="Error: location downloaded but data contains no xml."
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
else
# clean up xml and make easy to process with newlines, note, bsd sed has no support for inserting
# \n dircctly so we have to use this hack
# location_data="$( sed $SED_RX 's|><|>\n<|g' <<< $location_data )"
location_data="$( sed $SED_RX 's|><|>\
<|g' <<< $location_data )"
new version, new tarball, bug fix for weather
2013-05-18 04:11:18 +00:00
# echo -e "ld:\n$location_data"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
location_array_value=$( gawk '
function clean(data) {
returnData=""
# some lines might be empty, so ignore those
if (data !~ /^<[^>]+>$/ ) {
returnData=gensub(/(.*>)([^<]*)(<.*)/, "\\2", 1, data)
}
return returnData
}
BEGIN {
IGNORECASE=1
locationString=""
countryCode=""
countryCode3=""
countryName=""
regionCode=""
regionName=""
city=""
postalCode=""
latitude=""
longitude=""
timeZone=""
areaCode=""
}
/CountryCode/ {
if ( $0 ~ /CountryCode3/ ){
countryCode3=clean($0)
}
else {
countryCode=clean($0)
}
}
/CountryName/ {
countryName = clean($0)
}
/RegionCode/ {
regionCode = clean($0)
}
/RegionName/ {
regionName = clean($0)
}
/City/ {
city = clean($0)
}
/ZipPostalCode/ {
postalCode = clean($0)
}
/Latitude/ {
latitude = clean($0)
}
/Longitude/ {
longitude = clean($0)
}
/TimeZone/ {
timeZone = clean($0)
}
END {
locationString = city ";" regionCode ";" regionName ";" countryName ";" countryCode ";" countryCode3
locationString = locationString ";" latitude "," longitude ";" postalCode ";" timeZone
print locationString
new version, new tarball, bug fix for weather
2013-05-18 04:11:18 +00:00
}' <<< "$location_data" )
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
fi
A_WEATHER_DATA[0]=$location_array_value
IFS=";"
a_location=( ${A_WEATHER_DATA[0]} )
IFS="$ORIGINAL_IFS"
# assign location, cascade from most accurate
# latitude,longitude first
if [[ -n ${a_location[6]} ]];then
location="${a_location[6]}"
# city,state next
elif [[ -n ${a_location[0]} && -n ${a_location[1]} ]];then
location="${a_location[0]},${a_location[1]}"
# postal code last, that can be a very large region
elif [[ -n ${a_location[7]} ]];then
location=${a_location[7]}
fi
fi
if [[ $b_debug == 'true' ]];then
new version, new tarball, bug fix for weather
2013-05-18 04:11:18 +00:00
echo -e "location array:\n${A_WEATHER_DATA[0]}"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
echo "location: $location"
fi
new tarball, version, bug fixes on weather, also optimized speed for slow isps, and added a global that can be set in user / system configs to make a longer wget time out. Default is 8 seconds. This should take care of the failure from slow load issue reported.
2013-05-18 05:14:27 +00:00
log_function_data "location: $location"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
trying a patch fix for slow remote connections
2013-05-18 04:37:24 +00:00
if [[ -z $location && -z $data_grab_error ]];then
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
data_grab_error="Error: location data downloaded but no location detected."
fi
patch 2, trying to speed up for slow connection the weather tests
2013-05-18 04:49:36 +00:00
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
# now either dump process or go on to get weather data
patch 2, trying to speed up for slow connection the weather tests
2013-05-18 04:49:36 +00:00
if [[ -z $data_grab_error ]];then
new version, new tarball, bug fix for weather
2013-05-18 04:11:18 +00:00
if [[ $b_test_weather != 'true' ]];then
new tarball, version, bug fixes on weather, also optimized speed for slow isps, and added a global that can be set in user / system configs to make a longer wget time out. Default is 8 seconds. This should take care of the failure from slow load issue reported.
2013-05-18 05:14:27 +00:00
weather_data="$( wget -q -t 1 -T $WGET_TIMEOUT -O- $weather_feed"$location" || wget_error=$? )"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
if [[ $wget_error -ne 0 ]];then
data_grab_error="Error: weather server up but download error - wget: $wget_error"
fi
new tarball, version, bug fixes on weather, also optimized speed for slow isps, and added a global that can be set in user / system configs to make a longer wget time out. Default is 8 seconds. This should take care of the failure from slow load issue reported.
2013-05-18 05:14:27 +00:00
log_function_data "$weather_data"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
else
new tarball, version, bug fixes on weather, also optimized speed for slow isps, and added a global that can be set in user / system configs to make a longer wget time out. Default is 8 seconds. This should take care of the failure from slow load issue reported.
2013-05-18 05:14:27 +00:00
if [[ -f $test_dir$test_weather ]];then
weather_data="$( cat $test_dir$test_weather)"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
else
data_grab_error="Error: weather feed xml local file not found."
fi
fi
patch 2, trying to speed up for slow connection the weather tests
2013-05-18 04:49:36 +00:00
if [[ -z $data_grab_error && -z $( grep -i '<current_observation' <<< $weather_data ) ]];then
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
data_grab_error="Error: weather data downloaded but shows no xml start."
fi
if [[ -z $data_grab_error ]];then
# trim off zeros
weather_data=$( sed 's/^[[:space:]]*//' <<< "$weather_data" )
site_elevation=$( grep -im 1 '<elevation>' <<< "$weather_data" | sed $SED_RX -e 's/<[^>]*>//g' \
-e 's/\.[0-9]*//' )
new tarball, version. Bug fix on -! location=, forgot to have it pack its own location array, that's now correct.
2013-05-18 03:27:05 +00:00
# we need to grab the location data from the feed for remote checks
patch 2, trying to speed up for slow connection the weather tests
2013-05-18 04:49:36 +00:00
if [[ -n $ALTERNATE_WEATHER_LOCATION && -n $weather_data ]];then
new tarball, version. Bug fix on -! location=, forgot to have it pack its own location array, that's now correct.
2013-05-18 03:27:05 +00:00
location_data=$( sed -e '/<current_observation>/,/<display_location>/d' -e '/<\/display_location>/,/<\/current_observation>/d' <<< "$weather_data" )
new version, new tarball, bug fix for weather
2013-05-18 04:11:18 +00:00
# echo -e "ld1:\n$location_data"
new tarball, version. Bug fix on -! location=, forgot to have it pack its own location array, that's now correct.
2013-05-18 03:27:05 +00:00
A_WEATHER_DATA[0]=$( gawk '
function clean(data) {
returnData=""
# some lines might be empty, so ignore those
if (data !~ /^<[^>]+>$/ ) {
returnData=gensub(/(.*>)([^<]*)(<.*)/, "\\2", 1, data)
new version, tarball. Bug fix, overly loose regex removed na from country/state/city strings, like nashville.
2013-05-20 03:08:05 +00:00
gsub(/^[[:space:]]+|[[:space:]]+$|^NA$|^N\/A$/, "", returnData)
new tarball, version. Bug fix on -! location=, forgot to have it pack its own location array, that's now correct.
2013-05-18 03:27:05 +00:00
}
return returnData
}
BEGIN {
IGNORECASE=1
city=""
state=""
country=""
}
/<city>/ {
city=clean($0)
}
/<state>/ {
state=clean($0)
}
/<country>/ {
country=clean($0)
}
END {
print city ";" state ";;;;" country
}' <<< "$location_data" )
new version, new tarball, bug fix for weather
2013-05-18 04:11:18 +00:00
# echo -e "location:\n${A_WEATHER_DATA[0]}"
new tarball, version. Bug fix on -! location=, forgot to have it pack its own location array, that's now correct.
2013-05-18 03:27:05 +00:00
fi
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
# clean off everything before/after observation_location
weather_data=$( sed -e '/<current_observation>/,/<observation_location>/d' \
-e '/<icons>/,/<\/current_observation>/d' <<< "$weather_data" -e 's/^[[:space:]]*$//g' -e '/^$/d' )
# echo "$weather_data";exit
weather_array_value=$( gawk -v siteElevation="$site_elevation" '
function clean(data) {
returnData=""
# some lines might be empty, so ignore those
if (data !~ /^<[^>]+>$/ ) {
returnData=gensub(/(.*>)([^<]*)(<.*)/, "\\2", 1, data)
small code adjustment
2013-05-20 03:09:45 +00:00
gsub(/^[[:space:]]+|[[:space:]]+$|^NA$|^N\/A$/, "", returnData)
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
}
return returnData
}
BEGIN {
IGNORECASE=1
observationTime=""
localTime=""
weather=""
tempString=""
humidity=""
windString=""
pressureString=""
dewpointString=""
heatIndexString=""
windChillString=""
weatherString=""
}
/observation_time>/ {
observationTime=clean($0)
sub(/Last Updated on /, "", observationTime )
}
/local_time>/ {
localTime=clean($0)
}
/<weather/ {
weather=clean($0)
}
/temperature_string/ {
tempString=clean($0)
}
/relative_humidity/ {
humidity=clean($0)
}
/wind_string/ {
windString=clean($0)
}
/pressure_string/ {
pressureString=clean($0)
}
/heat_index_string/ {
heatIndexString=clean($0)
}
/windchill_string/ {
windChillString=clean($0)
}
END {
weatherString = observationTime ";" localTime ";" weather ";" tempString ";" humidity
weatherString = weatherString ";" windString ";" pressureString ";" dewpointString ";" heatIndexString
weatherString = weatherString ";" windChillString ";" siteElevation
print weatherString
}' <<< "$weather_data" )
fi
if [[ -z $weather_array_value ]];then
patch 2, trying to speed up for slow connection the weather tests
2013-05-18 04:49:36 +00:00
data_grab_error="Error: weather info downloaded but no data detected."
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
else
A_WEATHER_DATA[1]=$weather_array_value
fi
fi
patch 2, trying to speed up for slow connection the weather tests
2013-05-18 04:49:36 +00:00
# now either dump process or go on to get weather data
if [[ -n $data_grab_error ]];then
A_WEATHER_DATA=$data_grab_error
new tarball, version, bug fixes on weather, also optimized speed for slow isps, and added a global that can be set in user / system configs to make a longer wget time out. Default is 8 seconds. This should take care of the failure from slow load issue reported.
2013-05-18 05:14:27 +00:00
log_function_data "data grab error: $data_grab_error"
patch 2, trying to speed up for slow connection the weather tests
2013-05-18 04:49:36 +00:00
fi
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
if [[ $b_debug == 'true' ]];then
echo "site_elevation: $site_elevation"
echo "${A_WEATHER_DATA[1]}"
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_temp=${A_WEATHER_DATA[@]}
log_function_data "A_WEATHER_DATA: $a_temp"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
eval $LOGFE
}
new tarball, version. Bug fix on -! location=, forgot to have it pack its own location array, that's now correct.
2013-05-18 03:27:05 +00:00
# ALTERNATE_WEATHER_LOCATION='portland,or'
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
# get_weather_data;exit
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
#### -------------------------------------------------------------------
#### special data handling for specific options and conditions
#### -------------------------------------------------------------------
Patch version upgrade fixed a bug with remote mounted partitions, created line length counter function that cleans off color code characters to allow for accurate line counts for line breaks.
2011-06-19 05:53:18 +00:00
# args: $1 - string to strip color code characters out of
# returns count of string length minus colors
calculate_line_length()
{
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
local string=$1
Patch version upgrade fixed a bug with remote mounted partitions, created line length counter function that cleans off color code characters to allow for accurate line counts for line breaks.
2011-06-19 05:53:18 +00:00
# ansi:  irc: \x0312
string=$( sed -e "s/\x1b\[[0-9]\{1,2\}\(;[0-9]\{1,2\}\)\{0,2\}m//g" -e "s/\\\x0[0-9]\{1,3\}//g" <<< $string )
New version, new man page. Finally, after all these years, dynamically resized to terminal window column width help/version outputs. There is a significant slowdown to achieve this, but I've optimized it as much as I could so it should be acceptable for most users now.
2014-03-14 02:28:40 +00:00
count=${#string}
Patch version upgrade fixed a bug with remote mounted partitions, created line length counter function that cleans off color code characters to allow for accurate line counts for line breaks.
2011-06-19 05:53:18 +00:00
echo $count
}
Fixed broken cache output, fixed bogomips output, created new cpu data function that takes core count and data number and creates correct value for all cores total
2008-11-03 22:37:57 +00:00
## multiply the core count by the data to be calculated, bmips, cache
# args: $1 - string to handle; $2 - cpu count
calculate_multicore_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
Fixed broken cache output, fixed bogomips output, created new cpu data function that takes core count and data number and creates correct value for all cores total
2008-11-03 22:37:57 +00:00
local string_number=$1 string_data=''
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
if [[ -n $( grep -Ei '( mb| kb)' <<< $1 ) ]];then
Made all awk gawk to keep it consistent, this is the type of randomness we need to avoid in the future.
2008-11-07 19:59:11 +00:00
string_data=" $( gawk '{print $2}' <<< $1 )" # add a space for output
string_number=$( gawk '{print $1}' <<< $1 )
Fixed broken cache output, fixed bogomips output, created new cpu data function that takes core count and data number and creates correct value for all cores total
2008-11-03 22:37:57 +00:00
fi
added error condition to number calculator
2008-11-04 03:13:01 +00:00
# handle weird error cases where it's not a number
version upgrade got rid of that horrible banlist array/function thing, now it's hard coded. On a dual core system, this saves literally 0.1 seconds on execution, about 10-20% of execution time. this also fixes a bug that has always existed, which is if you use spaces to replace instead of ''. Another advantage of this new method it fixes the fact that each and every string character would be considered a match, null replaced with null. This was due to the fact that each banlist string started with |, ie, it contained a null character in the search pattern... sigh. This is why we don't use stupid bash tricks, ok people? They hide bugs, and make the code write only.
2011-06-20 21:58:17 +00:00
if [[ -n $( grep -E '^[0-9\.,]+$' <<< $string_number ) ]];then
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
string_number=$( echo $string_number $2 | gawk '{
total = $1*$2
print total
}' )
Made all if conditionals use the same syntax, [[.....]];then, since we couldn't get rid of all the [[ stuff without getting errors, it should all be the same, so [[....]] it is. Also cleaned up some other cruft and reorganized code slightly.
2008-11-06 19:43:28 +00:00
elif [[ $string_number == '' ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
string_number='N/A'
added error condition to number calculator
2008-11-04 03:13:01 +00:00
else
(Change Version) Tiny change, removed 'Error data:' string from bad cpu core count to make output neater.
2008-11-11 19:42:01 +00:00
# I believe that the above returns 'unknown' by default so no need for extra text
string_number="$string_number "
added error condition to number calculator
2008-11-04 03:13:01 +00:00
fi
Fixed broken cache output, fixed bogomips output, created new cpu data function that takes core count and data number and creates correct value for all cores total
2008-11-03 22:37:57 +00:00
echo "$string_number$string_data"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "string_numberstring_data: $string_number$string_data"
eval $LOGFE
Fixed broken cache output, fixed bogomips output, created new cpu data function that takes core count and data number and creates correct value for all cores total
2008-11-03 22:37:57 +00:00
}
improved extra whitespace handling in cpu model filters, now all > 1 whitespace becomes a single ' '
2008-11-05 23:15:09 +00:00
# prints out shortened list of flags, the main ones of interest
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
# args: $1 - string of cpu flags to process
process_cpu_flags()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
local cpu_flags_working=$1
local bits=$( uname -m | grep 64 )
# no need to show pae for 64 bit cpus, it's pointless
if [[ -n $bits ]];then
cpu_flags_working=$( sed 's/[[:space:]]*pae//' <<< "$cpu_flags_working" )
fi
(change version) fixed bug in sse output for flags
2010-03-05 22:36:09 +00:00
# must have a space after last item in list for RS=" "
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
cpu_flags_working="$cpu_flags_working "
tweaked cpu flag short output to handle sse4a and sse4 and sse5
2009-08-03 06:59:17 +00:00
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
# nx = AMD stack protection extensions
# lm = Intel 64bit extensions
tweaked cpu flag short output to handle sse4a and sse4 and sse5
2009-08-03 06:59:17 +00:00
# sse, sse2, pni = sse1,2,3,4,5 gfx extensions
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
# svm = AMD pacifica virtualization extensions
# vmx = Intel IVT (vanderpool) virtualization extensions
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
cpu_flags=$( gawk '
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
BEGIN {
RS=" "
(change version) fixed bug in sse output for flags
2010-03-05 22:36:09 +00:00
count = 0
i = 1 # start at one because of for increment issue
made cpu flag string code more readable
2009-08-03 07:07:31 +00:00
flag_string = ""
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
new version, fixed a long standing weakness, now the long -f full cpu flag output sorts, that's much easier to read. I also made the line lengths on that much more accurate to avoid a bunch of long flags creating a longer line, and made the first line shorter to handle the line starter text. New tarball as well, no man page changes. Not sure why this was left undone for so long, but here it is, nice and neat.
2013-01-18 22:22:58 +00:00
/^(lm|nx|pae|pni|svm|vmx|(sss|ss)e([2-9])?([a-z])?(_[0-9])?)$/ {
(change version) fixed bug in sse output for flags
2010-03-05 22:36:09 +00:00
if ( $0 == "pni" ){
a_flags[i] = "sse3"
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
}
(change version) fixed bug in sse output for flags
2010-03-05 22:36:09 +00:00
else {
a_flags[i] = $0
}
i++
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
}
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
END {
(change version) fixed bug in sse output for flags
2010-03-05 22:36:09 +00:00
count = asort( a_flags )
# note: why does gawk increment before the loop and not after? weird.
for ( i=0; i <= count; i++ ){
if ( flag_string == "" ) {
flag_string = a_flags[i]
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
}
else {
(change version) fixed bug in sse output for flags
2010-03-05 22:36:09 +00:00
flag_string = flag_string " " a_flags[i]
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
}
}
made cpu flag string code more readable
2009-08-03 07:07:31 +00:00
print flag_string
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
}' <<< "$cpu_flags_working" )
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
#grep -oE '\<(nx|lm|sse[0-9]?|pni|svm|vmx)\>' | tr '\n' ' '))
Made all if conditionals use the same syntax, [[.....]];then, since we couldn't get rid of all the [[ stuff without getting errors, it should all be the same, so [[....]] it is. Also cleaned up some other cruft and reorganized code slightly.
2008-11-06 19:43:28 +00:00
if [[ -z $cpu_flags ]];then
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
cpu_flags="-"
fi
echo "$cpu_flags"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "cpu_flags: $cpu_flags"
eval $LOGFE
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
}
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
#### -------------------------------------------------------------------
#### print and processing of output data
#### -------------------------------------------------------------------
(Change Version) 1. Fixed help menu bug, now if unsupported option, error prints out full list of options used so people can see what the wrong option was. 2. Refactored print_hdd_data, and split out print_hdd_partition_data to make it cleaner, and added triggers to primary print output function directly, instead of embedding them in the hdd print function. 3. Moved print_it_out to top of print functions, and made better comments to show how it works.
2008-11-10 17:57:52 +00:00
#### MASTER PRINT FUNCTION - triggers all line item print functions
## main function to print out, master for all sub print functions.
print_it_out()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
Fixed a few last bugs, shortoutput fine tuned, fixed variable names for spacer elements in short output, added one new class of variable naming, Some_Variable, for when the variable will be inherited by child functions, that way you know that the variable is going to be passed down, or has been inherited. And with those fine tuning changes, time for inxi to go to version 1.0.0
2009-02-11 17:28:25 +00:00
# note that print_it_out passes local variable values on to its children,
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
# and in some cases, their children, with Lspci_v_Data
local Lspci_v_Data='' Lspci_n_Data='' # only for verbose
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
local Sysctl_a_Data='' Dmesg_Boot_Data=''
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
if [[ -n $BSD_TYPE ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
Sysctl_a_Data="$( get_sysctl_data 'a' )"
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
Dmesg_Boot_Data="$( get_dmesg_boot_data )"
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
fi
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
if [[ $B_SHOW_SHORT_OUTPUT == 'true' ]];then
print_short_data
else
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
Lspci_v_Data="$( get_lspci_data 'v' )"
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
Lspci_n_Data="$( get_lspci_data 'n' )"
fi
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $B_SHOW_SYSTEM == 'true' ]];then
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
print_system_data
fi
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $B_SHOW_MACHINE == 'true' ]];then
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
print_machine_data
fi
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
if [[ $B_SHOW_WEATHER == 'true' ]];then
print_weather_data
fi
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $B_SHOW_BASIC_CPU == 'true' || $B_SHOW_CPU == 'true' ]];then
moved the machine line
2011-06-08 02:37:18 +00:00
print_cpu_data
fi
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $B_SHOW_GRAPHICS == 'true' ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
print_graphics_data
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
fi
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $B_SHOW_AUDIO == 'true' ]];then
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
print_audio_data
fi
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $B_SHOW_NETWORK == 'true' ]];then
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
print_networking_data
fi
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $B_SHOW_DISK_TOTAL == 'true' || $B_SHOW_BASIC_DISK == 'true' || $B_SHOW_DISK == 'true' ]];then
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
print_hard_disk_data
fi
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $B_SHOW_PARTITIONS == 'true' ]];then
(Change version) New option -p, outputs all discovered partition information along with the -P stuff. -P was improved to also show /tmp and /usr by default. -p will not show with -F to avoid flooding issues.
2008-12-03 23:14:21 +00:00
print_partition_data
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
fi
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
if [[ $B_SHOW_RAID == 'true' || $B_SHOW_BASIC_RAID == 'true' ]];then
print_raid_data
fi
(change version) new feature and option: -o shows unmounted local partitions, with uuid and label if present. Does not show with -F to avoid excessive output
2010-01-09 04:05:21 +00:00
if [[ $B_SHOW_UNMOUNTED_PARTITIONS == 'true' ]];then
print_unmounted_partition_data
fi
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $B_SHOW_SENSORS == 'true' ]];then
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
print_sensors_data
fi
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
if [[ $B_SHOW_REPOS == 'true' ]];then
print_repo_data
fi
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
if [[ $B_SHOW_PS_CPU_DATA == 'true' || $B_SHOW_PS_MEM_DATA == 'true' ]];then
print_ps_data
fi
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $B_SHOW_INFO == 'true' ]];then
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
print_info_data
fi
fi
New version: fixed an old bug, with -c 0, no colors, RED and NORMAL color codes were not set to null, which results in some cases with red output, along with turning terminal/console font color red.
2014-03-26 19:46:58 +00:00
## last steps, clear any lingering colors
if [[ $B_IRC == 'false' && $SCHEME -gt 0 ]];then
echo -n ""
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
}
#### SHORT OUTPUT PRINT FUNCTION, ie, verbosity 0
# all the get data stuff is loaded here to keep execution time down for single line print commands
# these will also be loaded in each relevant print function for long output
print_short_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
local current_kernel=$( get_kernel_version )
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
local processes=$(( $( wc -l <<< "$Ps_aux_Data" ) - 1 ))
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
local short_data='' i='' b_background_black='false'
local memory=$( get_memory_data )
local up_time="$( get_uptime )"
(Change Version) 1. Fixed help menu bug, now if unsupported option, error prints out full list of options used so people can see what the wrong option was. 2. Refactored print_hdd_data, and split out print_hdd_partition_data to make it cleaner, and added triggers to primary print output function directly, instead of embedding them in the hdd print function. 3. Moved print_it_out to top of print functions, and made better comments to show how it works.
2008-11-10 17:57:52 +00:00
# set A_CPU_CORE_DATA
get_cpu_core_count
(Change version) This fixes the multiple physical cpu missing data. I had to simplify the ht/smp part to make it work, also, from what I can tell, we only really need the terms: UP SMP HT SMP-HT which cover all possible scenarios from what I can tell http://en.wikipedia.org/wiki/Symmetric_multiprocessing says that it's all basically smp, single cpu, dual core, or multi cpu, single or multi core.
2009-02-03 22:20:11 +00:00
local cpc_plural='' cpu_count_print='' model_plural=''
local cpu_physical_count=${A_CPU_CORE_DATA[0]}
local cpu_core_count=${A_CPU_CORE_DATA[3]}
local cpu_core_alpha=${A_CPU_CORE_DATA[1]}
local cpu_type=${A_CPU_CORE_DATA[2]}
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
(version change) Hopefully close to last cleanup and tweaks before releasing 1.0.0, but we'll see if more features or fixes need to be implemented.
2009-02-05 18:52:17 +00:00
if [[ $cpu_physical_count -gt 1 ]];then
(Change version) This fixes the multiple physical cpu missing data. I had to simplify the ht/smp part to make it work, also, from what I can tell, we only really need the terms: UP SMP HT SMP-HT which cover all possible scenarios from what I can tell http://en.wikipedia.org/wiki/Symmetric_multiprocessing says that it's all basically smp, single cpu, dual core, or multi cpu, single or multi core.
2009-02-03 22:20:11 +00:00
cpc_plural='(s)'
model_plural='s'
cpu_count_print="$cpu_physical_count "
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local cpu_data_string="$cpu_count_print$cpu_core_alpha core"
(Change version) This fixes the multiple physical cpu missing data. I had to simplify the ht/smp part to make it work, also, from what I can tell, we only really need the terms: UP SMP HT SMP-HT which cover all possible scenarios from what I can tell http://en.wikipedia.org/wiki/Symmetric_multiprocessing says that it's all basically smp, single cpu, dual core, or multi cpu, single or multi core.
2009-02-03 22:20:11 +00:00
# local cpu_core_count=${A_CPU_CORE_DATA[0]}
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
(Change Version) 1. Fixed help menu bug, now if unsupported option, error prints out full list of options used so people can see what the wrong option was. 2. Refactored print_hdd_data, and split out print_hdd_partition_data to make it cleaner, and added triggers to primary print output function directly, instead of embedding them in the hdd print function. 3. Moved print_it_out to top of print functions, and made better comments to show how it works.
2008-11-10 17:57:52 +00:00
# load A_HDD_DATA
get_hdd_data_basic
## note: if hdd_model is declared prior to use, whatever string you want inserted will
## be inserted first. In this case, it's desirable to print out (x) before each disk found.
local a_hdd_data_count=$(( ${#A_HDD_DATA[@]} - 1 ))
IFS=","
local a_hdd_basic_working=( ${A_HDD_DATA[$a_hdd_data_count]} )
IFS="$ORIGINAL_IFS"
local hdd_capacity=${a_hdd_basic_working[0]}
local hdd_used=${a_hdd_basic_working[1]}
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
(Change Version) 1. Fixed help menu bug, now if unsupported option, error prints out full list of options used so people can see what the wrong option was. 2. Refactored print_hdd_data, and split out print_hdd_partition_data to make it cleaner, and added triggers to primary print output function directly, instead of embedding them in the hdd print function. 3. Moved print_it_out to top of print functions, and made better comments to show how it works.
2008-11-10 17:57:52 +00:00
# load A_CPU_DATA
get_cpu_data
IFS=","
local a_cpu_working=(${A_CPU_DATA[0]})
IFS="$ORIGINAL_IFS"
local cpu_model="${a_cpu_working[0]}"
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
## assemble data for output
local cpu_clock="${a_cpu_working[1]}" # old CPU3
New Version, new tarball. Added inxi.changelog to tarball as well. Continuing fixes for ARM cpus, it was noted that short form inxi failed to show cpu speed derived from bogomips. That's because of the old min/max output that short form used. Updated that section to now use N/A as flag, and if N/A for min/max speed, use the speed given from first cpu array index, the one derived from bogomips for ARM/razberry pi. Note that there is still no other ARM /proc/cpuinfo available to see if the razberry pi fixes work for all ARM cpus, but the fixes will stop hangs and endless loops at worst, and may also show some type of cpu speeds for ARM cpus that are not in razpi devices.
2013-01-22 20:47:00 +00:00
# this gets that weird min/max final array item, which almost never contains any data of use
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
local min_max_clock_nu=$(( ${#A_CPU_DATA[@]} - 1 ))
local min_max_clock=${A_CPU_DATA[$min_max_clock_nu]}
New Version, new tarball. Added inxi.changelog to tarball as well. Continuing fixes for ARM cpus, it was noted that short form inxi failed to show cpu speed derived from bogomips. That's because of the old min/max output that short form used. Updated that section to now use N/A as flag, and if N/A for min/max speed, use the speed given from first cpu array index, the one derived from bogomips for ARM/razberry pi. Note that there is still no other ARM /proc/cpuinfo available to see if the razberry pi fixes work for all ARM cpus, but the fixes will stop hangs and endless loops at worst, and may also show some type of cpu speeds for ARM cpus that are not in razpi devices.
2013-01-22 20:47:00 +00:00
# this handles the case of for example ARM cpus, which will not have data for
# min/max, since they don't have speed. Since that sets a flag, not found, just
# look for that and use the speed from the first array array, same where we got
# model from
if [[ "$min_max_clock" == 'N/A' && ${a_cpu_working[1]} != '' ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
min_max_clock="${a_cpu_working[1]} MHz"
New Version, new tarball. Added inxi.changelog to tarball as well. Continuing fixes for ARM cpus, it was noted that short form inxi failed to show cpu speed derived from bogomips. That's because of the old min/max output that short form used. Updated that section to now use N/A as flag, and if N/A for min/max speed, use the speed given from first cpu array index, the one derived from bogomips for ARM/razberry pi. Note that there is still no other ARM /proc/cpuinfo available to see if the razberry pi fixes work for all ARM cpus, but the fixes will stop hangs and endless loops at worst, and may also show some type of cpu speeds for ARM cpus that are not in razpi devices.
2013-01-22 20:47:00 +00:00
fi
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
local patch_version_number=$( get_patch_version_string )
(Change Version) 1. Fixed help menu bug, now if unsupported option, error prints out full list of options used so people can see what the wrong option was. 2. Refactored print_hdd_data, and split out print_hdd_partition_data to make it cleaner, and added triggers to primary print output function directly, instead of embedding them in the hdd print function. 3. Moved print_it_out to top of print functions, and made better comments to show how it works.
2008-11-10 17:57:52 +00:00
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
#set_color_scheme 12
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'true' ]];then
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
for i in $C1 $C2 $CN
do
case "$i" in
"$GREEN"|"$WHITE"|"$YELLOW"|"$CYAN")
b_background_black='true'
;;
esac
done
if [[ $b_background_black == 'true' ]];then
for i in C1 C2 CN
do
## these need to be in quotes, don't know why
(version change) Hopefully close to last cleanup and tweaks before releasing 1.0.0, but we'll see if more features or fixes need to be implemented.
2009-02-05 18:52:17 +00:00
if [[ ${!i} == $NORMAL ]];then
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
declare $i="${!i}15,1"
else
declare $i="${!i},1"
fi
done
#C1="${C1},1"; C2="${C2},1"; CN="${CN},1"
fi
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
short_data="${C1}CPU$cpc_plural${C2}$SEP1$cpu_data_string $cpu_model$model_plural ($cpu_type) clocked at $min_max_clock$SEP2${C1}Kernel${C2}$SEP1$current_kernel$SEP2${C1}Up${C2}$SEP1$up_time$SEP2${C1}Mem${C2}$SEP1$memory$SEP2${C1}HDD${C2}$SEP1$hdd_capacity($hdd_used)$SEP2${C1}Procs${C2}$SEP1$processes$SEP2"
(Change Version) 1. Fixed help menu bug, now if unsupported option, error prints out full list of options used so people can see what the wrong option was. 2. Refactored print_hdd_data, and split out print_hdd_partition_data to make it cleaner, and added triggers to primary print output function directly, instead of embedding them in the hdd print function. 3. Moved print_it_out to top of print functions, and made better comments to show how it works.
2008-11-10 17:57:52 +00:00
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
if [[ $SHOW_IRC -gt 0 ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
short_data="$short_data${C1}Client${C2}$SEP1$IRC_CLIENT$IRC_CLIENT_VERSION$SEP2"
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
short_data="$short_data${C1}$SCRIPT_NAME${C2}$SEP1$SCRIPT_VERSION_NUMBER$patch_version_number$SEP2${CN}"
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
if [[ $SCHEME -gt 0 ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
short_data="$short_data $NORMAL"
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
fi
print_screen_output "$short_data"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
(Change Version) 1. Fixed help menu bug, now if unsupported option, error prints out full list of options used so people can see what the wrong option was. 2. Refactored print_hdd_data, and split out print_hdd_partition_data to make it cleaner, and added triggers to primary print output function directly, instead of embedding them in the hdd print function. 3. Moved print_it_out to top of print functions, and made better comments to show how it works.
2008-11-10 17:57:52 +00:00
}
#### LINE ITEM PRINT FUNCTIONS
# print sound card data
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
print_audio_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
local i='' card_id='' audio_data='' a_audio_data='' port_data='' pci_bus_id='' card_string=''
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
local a_audio_working='' audio_driver='' alsa_data='' port_plural='' module_version='' chip_id=''
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
local bus_usb_text='' bus_usb_id='' line_starter='Audio:' alsa='' alsa_version='' print_data=''
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
local driver=''
(Change Version) Got a good rough working alsa driver going. This only works for one card, dual or more cards will simply not show the driver field, but everyone with just one card will be able to see their running driver. This is an ok compromise for now, but it wasn't super elegant.
2008-11-14 07:20:52 +00:00
# set A_AUDIO_DATA and get alsa data
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
if [[ $BSD_TYPE == 'bsd' ]];then
if [[ $B_PCICONF_SET == 'false' ]];then
get_pciconf_data
fi
get_pciconf_card_data 'audio'
else
get_audio_data
fi
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
get_audio_alsa_data
# alsa driver data now prints out no matter what
if [[ -n $A_ALSA_DATA ]];then
IFS=","
if [[ -n ${A_ALSA_DATA[0]} ]];then
alsa=${A_ALSA_DATA[0]}
else
alsa='N/A'
fi
if [[ -n ${A_ALSA_DATA[1]} ]];then
alsa_version=${A_ALSA_DATA[1]}
else
alsa_version='N/A'
fi
New version: fixed an old bug, with -c 0, no colors, RED and NORMAL color codes were not set to null, which results in some cases with red output, along with turning terminal/console font color red.
2014-03-26 19:46:58 +00:00
alsa_data="${C1}Sound$SEP3${C2} $alsa ${C1}v$SEP3${C2} $alsa_version"
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
IFS="$ORIGINAL_IFS"
fi
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
# note, error handling is done in the get function, so this will never be null, but
# leaving the test just in case it's changed.
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
if [[ -n ${A_AUDIO_DATA[@]} ]];then
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
for (( i=0; i< ${#A_AUDIO_DATA[@]}; i++ ))
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
do
IFS=","
a_audio_working=( ${A_AUDIO_DATA[i]} )
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
IFS="$ORIGINAL_IFS"
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
port_data=''
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
audio_driver=''
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
audio_data=''
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
card_string=''
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
port_plural=''
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
module_version=''
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
pci_bus_id=''
synched audio output to use usb id as well if -x runs
2011-04-30 23:10:06 +00:00
bus_usb_text=''
bus_usb_id=''
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
print_data=''
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=''
updates
2012-10-19 05:33:30 +00:00
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
if [[ ${#A_AUDIO_DATA[@]} -gt 1 ]];then
card_id="-$(( $i + 1 ))"
fi
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
if [[ $BSD_TYPE != 'bsd' ]];then
if [[ -n ${a_audio_working[3]} && $B_EXTRA_DATA == 'true' ]];then
module_version=$( print_module_version "${a_audio_working[3]}" 'audio' )
elif [[ -n ${a_audio_working[1]} && $B_EXTRA_DATA == 'true' ]];then
module_version=$( print_module_version "${a_audio_working[1]}" 'audio' )
fi
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
fi
(change version) This is as close as I can get to getting the alsa driver to show, but it only works if lspci for audio comes up blank, that way we can use /proc/asound/cards for all the data and extract the card and driver from that into an array. But I can't see any way to match the full output of lspci if present with the card data from /proc/asound/cards, because sometimes there is nothing in common between the two. Maybe someone else can solve this one...
2008-11-14 03:32:47 +00:00
# we're testing for the presence of the 2nd array item here, which is the driver name
(Change Version) Got a good rough working alsa driver going. This only works for one card, dual or more cards will simply not show the driver field, but everyone with just one card will be able to see their running driver. This is an ok compromise for now, but it wasn't super elegant.
2008-11-14 07:20:52 +00:00
if [[ -n ${a_audio_working[1]} ]];then
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
# note: linux drivers can have numbers, like tg3
if [[ $BSD_TYPE == 'bsd' ]];then
driver=$( sed 's/[0-9]$//' <<< ${a_audio_working[1]} )
else
driver=${a_audio_working[1]}
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
audio_driver="${C1}driver$SEP3${C2} $driver "
(change version) This is as close as I can get to getting the alsa driver to show, but it only works if lspci for audio comes up blank, that way we can use /proc/asound/cards for all the data and extract the card and driver from that into an array. But I can't see any way to match the full output of lspci if present with the card data from /proc/asound/cards, because sometimes there is nothing in common between the two. Maybe someone else can solve this one...
2008-11-14 03:32:47 +00:00
fi
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
if [[ -n ${a_audio_working[2]} && $B_EXTRA_DATA == 'true' ]];then
if [[ $( wc -w <<< ${a_audio_working[2]} ) -gt 1 ]];then
port_plural='s'
fi
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
port_data="${C1}port$port_plural$SEP3${C2} ${a_audio_working[2]} "
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
fi
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
if [[ -n ${a_audio_working[4]} && $B_EXTRA_DATA == 'true' ]];then
patch for usb audio output tweak, patch for possible bug in usb audio function.
2011-06-23 01:25:35 +00:00
if [[ ${a_audio_working[1]} != 'USB Audio' ]];then
and also making busID into bus-ID to make it consistent as well
2011-04-30 23:37:24 +00:00
bus_usb_text='bus-ID'
updates
2012-10-19 05:33:30 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
if [[ $BSD_TYPE != 'bsd' ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=$( get_lspci_chip_id "${a_audio_working[4]}" )
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
else
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=${a_audio_working[6]}
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
fi
updates
2012-10-19 05:33:30 +00:00
fi
synched audio output to use usb id as well if -x runs
2011-04-30 23:10:06 +00:00
else
trying usb-ID instead of USB-ID, looks more consistent
2011-04-30 23:36:38 +00:00
bus_usb_text='usb-ID'
updates
2012-10-19 05:33:30 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=${a_audio_working[5]}
updates
2012-10-19 05:33:30 +00:00
fi
synched audio output to use usb id as well if -x runs
2011-04-30 23:10:06 +00:00
fi
bus_usb_id=${a_audio_working[4]}
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
pci_bus_id="${C1}$bus_usb_text$SEP3${C2} $bus_usb_id "
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ -n $chip_id ]];then
chip_id="${C1}chip-ID$SEP3${C2} $chip_id "
updates
2012-10-19 05:33:30 +00:00
fi
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
fi
(Change Version) Got a good rough working alsa driver going. This only works for one card, dual or more cards will simply not show the driver field, but everyone with just one card will be able to see their running driver. This is an ok compromise for now, but it wasn't super elegant.
2008-11-14 07:20:52 +00:00
if [[ -n ${a_audio_working[0]} ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
card_string="${C1}Card$card_id$EP3${C2} ${a_audio_working[0]} "
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
audio_data="$audio_driver$port_data$pci_bus_id$chip_id"
(Change Version) Added alsa sound output as well if the /proc file is found
2008-11-14 00:42:13 +00:00
fi
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
# only print alsa on last line if short enough, otherwise print on its own line
if [[ $i -eq 0 ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ -n $alsa_data && $( calculate_line_length "$card_string$audio_data$alsa_data" ) -lt $COLS_INNER ]];then
tweaked A output a bit to make it cleaner on shorter lines
2012-10-19 18:51:02 +00:00
audio_data="$audio_data$alsa_data"
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
alsa_data=''
fi
fi
(change version) This is as close as I can get to getting the alsa driver to show, but it only works if lspci for audio comes up blank, that way we can use /proc/asound/cards for all the data and extract the card and driver from that into an array. But I can't see any way to match the full output of lspci if present with the card data from /proc/asound/cards, because sometimes there is nothing in common between the two. Maybe someone else can solve this one...
2008-11-14 03:32:47 +00:00
if [[ -n $audio_data ]];then
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
if [[ $( calculate_line_length "$card_string$audio_data" ) -lt $COLS_INNER ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
print_data=$( create_print_line "$line_starter" "$card_string$audio_data${CN}" )
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
print_screen_output "$print_data"
tweaked A output a bit to make it cleaner on shorter lines
2012-10-19 18:51:02 +00:00
# print the line
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
else
tweaked A output a bit to make it cleaner on shorter lines
2012-10-19 18:51:02 +00:00
# keep the driver on the same line no matter what, looks weird alone on its own line
if [[ $B_EXTRA_DATA != 'true' ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
print_data=$( create_print_line "$line_starter" "$card_string$audio_data${CN}" )
tweaked A output a bit to make it cleaner on shorter lines
2012-10-19 18:51:02 +00:00
print_screen_output "$print_data"
else
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
print_data=$( create_print_line "$line_starter" "$card_string${CN}" )
tweaked A output a bit to make it cleaner on shorter lines
2012-10-19 18:51:02 +00:00
print_screen_output "$print_data"
line_starter=' '
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
print_data=$( create_print_line "$line_starter" "$audio_data${CN}" )
tweaked A output a bit to make it cleaner on shorter lines
2012-10-19 18:51:02 +00:00
print_screen_output "$print_data"
fi
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
fi
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
line_starter=' '
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
fi
done
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
fi
if [[ -n $alsa_data ]];then
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
alsa_data=$( sed 's/ALSA/Advanced Linux Sound Architecture/' <<< $alsa_data )
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
alsa_data=$( create_print_line "$line_starter" "$alsa_data${CN}" )
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
print_screen_output "$alsa_data"
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Added -v6 option, show audio / sound card data. Cleaned up last chunks of crufty code and variable names, found a few hidden non handled old style variables and structures. Less junk in there now, but still a few spots where things need polishing.
2008-11-04 20:02:05 +00:00
}
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
print_cpu_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
local cpu_data='' i='' cpu_clock_speed='' cpu_multi_clock_data=''
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
local bmip_data='' cpu_cache='' cpu_vendor='' cpu_flags='' flag_feature='flags'
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
local a_cpu_working='' cpu_model='' cpu_clock='' cpu_null_error=''
local cpc_plural='' cpu_count_print='' model_plural='' cpu_data_string=''
local cpu_physical_count='' cpu_core_count='' cpu_core_alpha='' cpu_type=''
New version, fixed cpu core speed wrapping, improved -p and -P wrapping, though some lines will still be too long, but not as many.
2014-03-25 01:43:30 +00:00
local cpu_2_data='' working_cpu=''
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
local line_starter='' multi_cpu_starter="${C1}Clock Speeds$SEP3${C2} "
Some bash tweaks, tests on use of [ vs [[ brackets and arrays
2008-11-03 21:04:21 +00:00
Added new verbosity level, 5. Allows for printout of clockspeed per cpu on new line if cpu count > 1
2008-10-31 21:12:23 +00:00
##print_screen_output "A_CPU_DATA[0]=\"${A_CPU_DATA[0]}\""
(No Version Change) Just some comment cleanups and small code cleanups.
2008-11-12 19:21:24 +00:00
# Array A_CPU_DATA always has one extra element: max clockfreq found.
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
# that's why its count is one more than you'd think from cores/cpus alone
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
# load A_CPU_DATA
get_cpu_data
IFS=","
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
a_cpu_working=(${A_CPU_DATA[0]})
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
IFS="$ORIGINAL_IFS"
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
Cleaned up some testing cases, removed and cleaned up comments, tweaked the full hard drive output a bit
2008-11-09 20:20:23 +00:00
# Strange (and also some expected) behavior encountered. If print_screen_output() uses $1
# as the parameter to output to the screen, then passing "<text1> ${ARR[@]} <text2>"
# will output only <text1> and first element of ARR. That "@" splits in elements and "*" _doesn't_,
# is to be expected. However, that text2 is consecutively truncated is somewhat strange, so take note.
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
# This has been confirmed by #bash on freenode.
# The above mentioned only emerges when using the debugging markers below
Added new verbosity level, 5. Allows for printout of clockspeed per cpu on new line if cpu count > 1
2008-10-31 21:12:23 +00:00
## print_screen_output "a_cpu_working=\"***${a_cpu_working[@]} $hostName+++++++\"----------"
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# unless all these are null, process whatever you have
if [[ -n ${a_cpu_working[0]} || -n ${a_cpu_working[1]} || -n ${a_cpu_working[2]} || -n ${a_cpu_working[3]} ]];then
cpu_model="${a_cpu_working[0]}"
## assemble data for output
cpu_clock="${a_cpu_working[1]}"
cpu_vendor=${a_cpu_working[5]}
# set A_CPU_CORE_DATA
get_cpu_core_count
cpu_physical_count=${A_CPU_CORE_DATA[0]}
cpu_core_count=${A_CPU_CORE_DATA[3]}
cpu_core_alpha=${A_CPU_CORE_DATA[1]}
cpu_type=${A_CPU_CORE_DATA[2]}
if [[ $cpu_physical_count -gt 1 ]];then
cpc_plural='(s)'
cpu_count_print="$cpu_physical_count "
model_plural='s'
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
line_starter="CPU$cpc_plural$SEP3"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
cpu_data_string="$cpu_count_print$cpu_core_alpha core"
cpu_data="${C1}$cpu_data_string${C2} ${a_cpu_working[0]}$model_plural ($cpu_type)"
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
if [[ $B_SHOW_CPU == 'true' ]];then
# update for multicore, bogomips x core count.
if [[ $B_EXTRA_DATA == 'true' ]];then
# if [[ $cpu_vendor != 'intel' ]];then
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
# ARM may use the faked 1 cpucorecount to make this work
# echo $cpu_core_count $cpu_physical_count
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
if [[ -n ${a_cpu_working[4]} ]];then
bmip_data=$( calculate_multicore_data "${a_cpu_working[4]}" "$(( $cpu_core_count * $cpu_physical_count ))" )
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
bmip_data=${bmip_data%.*}
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
fi
# else
# bmip_data="${a_cpu_working[4]}"
# fi
# bogomips are a linux thing, but my guess is over time bsds will use them somewhere anyway
if [[ $BSD_TYPE == 'bsd' && -z $bmip_data ]];then
bmip_data=''
else
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
bmip_data="${C1}bmips$SEP3${C2} $bmip_data "
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
fi
fi
## note: this handles how intel reports L2, total instead of per core like AMD does
# note that we need to multiply by number of actual cpus here to get true cache size
if [[ -n ${a_cpu_working[2]} ]];then
if [[ $cpu_vendor != 'intel' ]];then
cpu_cache=$( calculate_multicore_data "${a_cpu_working[2]}" "$(( $cpu_core_count * $cpu_physical_count ))" )
else
cpu_cache=$( calculate_multicore_data "${a_cpu_working[2]}" "$cpu_physical_count" )
fi
else
cpu_cache='N/A'
fi
# only print shortened list
if [[ $B_CPU_FLAGS_FULL != 'true' ]];then
# gawk has already sorted this output, no flags returns -
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
if [[ $B_EXTRA_DATA == 'true' ]];then
cpu_flags=$( process_cpu_flags "${a_cpu_working[3]}" "${a_cpu_working[6]}" )
cpu_flags="($cpu_flags)"
if [[ ${a_cpu_working[6]} == 'true' ]];then
flag_feature='features'
fi
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
cpu_flags="${C1}$flag_feature$SEP3${C2} $cpu_flags "
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
fi
fi
# arm cpus do not have flags or cache
if [[ ${a_cpu_working[6]} != 'true' ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
cpu_data="$cpu_data${C2} ${C1}cache$SEP3${C2} $cpu_cache"
cpu_2_data="$cpu_flags$bmip_data"
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
else
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
cpu_data="$cpu_data${C2} (ARM)$bmip_data"
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
fi
Try to fix L2 misreporting issue for intel core duo
2008-11-05 02:32:53 +00:00
fi
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# we don't this printing out extra line unless > 1 cpu core
if [[ ${#A_CPU_DATA[@]} -gt 2 && $B_SHOW_CPU == 'true' ]];then
cpu_clock_speed='' # null < verbosity level 5
else
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
cpu_data="$cpu_data ${C1}clocked at${C2} ${a_cpu_working[1]%.*} MHz"
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
fi
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
cpu_2_data="$cpu_2_data$cpu_clock_speed"
Added new verbosity level, 5. Allows for printout of clockspeed per cpu on new line if cpu count > 1
2008-10-31 21:12:23 +00:00
else
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
if [[ $BSD_TYPE == 'bsd' && $B_ROOT != 'true' ]];then
cpu_null_error=' No permissions for sysctl use?'
fi
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
cpu_data="${C2}No CPU data available.$cpu_null_error"
Added new verbosity level, 5. Allows for printout of clockspeed per cpu on new line if cpu count > 1
2008-10-31 21:12:23 +00:00
fi
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
# echo $cpu_data $cpu_2_data
# echo ln: $( calculate_line_length "$cpu_data $cpu_2_data" )
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
# echo cpl: $( create_print_line "$line_starter" "$cpu_2_data${CN}" ):
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
# echo icols: $COLS_INNER
# echo tc: $TERM_COLUMNS
# echo :${cpu_2_data}:
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
if [[ -n $cpu_2_data && $( calculate_line_length "$cpu_data $cpu_2_data" ) -gt $COLS_INNER ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
cpu_data=$( create_print_line "$line_starter" "$cpu_data${CN}" )
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
line_starter=' '
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
print_screen_output "$cpu_data"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
cpu_data=$( create_print_line " " "$cpu_2_data${CN}" )
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
print_screen_output "$cpu_data"
else
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
cpu_data=$( create_print_line "$line_starter" "$cpu_data${CN}" )
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_screen_output "$cpu_data $cpu_2_data"
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
fi
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
# we don't this printing out extra line unless > 1 cpu core
New Version, new tarball. Added inxi.changelog to tarball as well. Continuing fixes for ARM cpus, it was noted that short form inxi failed to show cpu speed derived from bogomips. That's because of the old min/max output that short form used. Updated that section to now use N/A as flag, and if N/A for min/max speed, use the speed given from first cpu array index, the one derived from bogomips for ARM/razberry pi. Note that there is still no other ARM /proc/cpuinfo available to see if the razberry pi fixes work for all ARM cpus, but the fixes will stop hangs and endless loops at worst, and may also show some type of cpu speeds for ARM cpus that are not in razpi devices.
2013-01-22 20:47:00 +00:00
# note the numbering, the last array item is the min/max/not found for cpu speeds
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ ${#A_CPU_DATA[@]} -gt 2 && $B_SHOW_CPU == 'true' ]];then
Added new verbosity level, 5. Allows for printout of clockspeed per cpu on new line if cpu count > 1
2008-10-31 21:12:23 +00:00
for (( i=0; i < ${#A_CPU_DATA[@]}-1; i++ ))
do
IFS=","
a_cpu_working=(${A_CPU_DATA[i]})
Fixed broken cache output, fixed bogomips output, created new cpu data function that takes core count and data number and creates correct value for all cores total
2008-11-03 22:37:57 +00:00
IFS="$ORIGINAL_IFS"
(change version) fixed a subtle spacing issue that sometimes makes some data change irc colors, now all spacing should protect against that.
2009-03-20 21:13:11 +00:00
# note: the first iteration will create a first space, for color code separation below
removed 10 cpu core print limit, I don't see any reason for that, and it might confuse users if they have more.
2011-01-12 00:18:03 +00:00
# someone actually appeared with a 16 core system, so going to stop the cpu core throttle
# if this had some other purpose which we can't remember we'll add it back in
#if [[ $i -gt 10 ]];then
# break
#fi
New version, fixed cpu core speed wrapping, improved -p and -P wrapping, though some lines will still be too long, but not as many.
2014-03-25 01:43:30 +00:00
# echo $(calculate_line_length "$multi_cpu_starter$SEP3 $cpu_multi_clock_data" )
working_cpu="${C1}$(( i + 1 ))$SEP3${C2} ${a_cpu_working[1]%.*} MHz "
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
if [[ -n $cpu_multi_clock_data && \
New version, fixed cpu core speed wrapping, improved -p and -P wrapping, though some lines will still be too long, but not as many.
2014-03-25 01:43:30 +00:00
$( calculate_line_length "$multi_cpu_starter$cpu_multi_clock_data$working_cpu" ) -gt $COLS_INNER ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
cpu_multi_clock_data=$( create_print_line " " "$multi_cpu_starter$cpu_multi_clock_data" )
print_screen_output "$cpu_multi_clock_data"
multi_cpu_starter=''
New version, fixed cpu core speed wrapping, improved -p and -P wrapping, though some lines will still be too long, but not as many.
2014-03-25 01:43:30 +00:00
cpu_multi_clock_data="$working_cpu"
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
else
New version, fixed cpu core speed wrapping, improved -p and -P wrapping, though some lines will still be too long, but not as many.
2014-03-25 01:43:30 +00:00
cpu_multi_clock_data="$cpu_multi_clock_data$working_cpu"
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
fi
Added new verbosity level, 5. Allows for printout of clockspeed per cpu on new line if cpu count > 1
2008-10-31 21:12:23 +00:00
done
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
fi
# print the last line if it exists after loop
if [[ -n $cpu_multi_clock_data ]];then
cpu_multi_clock_data=$( create_print_line " " "$multi_cpu_starter$cpu_multi_clock_data" )
print_screen_output "$cpu_multi_clock_data"
Added new verbosity level, 5. Allows for printout of clockspeed per cpu on new line if cpu count > 1
2008-10-31 21:12:23 +00:00
fi
Made all if conditionals use the same syntax, [[.....]];then, since we couldn't get rid of all the [[ stuff without getting errors, it should all be the same, so [[....]] it is. Also cleaned up some other cruft and reorganized code slightly.
2008-11-06 19:43:28 +00:00
if [[ $B_CPU_FLAGS_FULL == 'true' ]];then
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
print_cpu_flags_full "${a_cpu_working[3]}" "${a_cpu_working[6]}"
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
}
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
# takes list of all flags, split them and prints x per line
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
# args: $1 - cpu flag string; $2 - arm true/false
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
print_cpu_flags_full()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
new version, fixed a long standing weakness, now the long -f full cpu flag output sorts, that's much easier to read. I also made the line lengths on that much more accurate to avoid a bunch of long flags creating a longer line, and made the first line shorter to handle the line starter text. New tarball as well, no man page changes. Not sure why this was left undone for so long, but here it is, nice and neat.
2013-01-18 22:22:58 +00:00
# note: sort only sorts lines, not words in a string, so convert to lines
local cpu_flags_full="$( echo $1 | tr " " "\n" | sort )"
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
local a_cpu_flags='' line_starter='' temp_string=''
New version. Some BSD fixes, and a more important fix, added 'display controller' to graphics card detection, that's a new one on me. Dual card systems might use this. 00:02.0 Display controller: Intel Corporation 82865G Integrated Graphics Controller (rev 02) 01:00.0 VGA compatible controller: NVIDIA Corporation NV44A [GeForce 6200] (rev a1) Some more switches to bash native methods as well.
2014-03-18 02:26:26 +00:00
local i=0 counter=0 starter_length=0 flag='' flag_data=''
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
local line_length='' flag_feature='Flags' spacer='' flag_string=''
New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not show cache/flags for arm cpus becuase they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.
2013-06-20 02:18:56 +00:00
if [[ $2 == 'true' ]];then
flag_feature='Features'
fi
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
line_starter="CPU $flag_feature$SEP3"
starter_length=$(( ${#line_starter} + 1 ))
line_starter="${C1}$line_starter${C2} "
line_length=$(( $COLS_INNER - $starter_length ))
Fixed cpu flag line print as well, uses arrays now, so no need to use numbered line outputs etc.
2008-12-05 05:54:07 +00:00
# build the flag line array
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
for flag in $cpu_flags_full
do
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
temp_string="$flag_string$spacer$flag"
spacer=' '
# handle inner line starter
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
if [[ $counter -gt 0 ]];then
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
line_length=$COLS_INNER
new version, fixed a long standing weakness, now the long -f full cpu flag output sorts, that's much easier to read. I also made the line lengths on that much more accurate to avoid a bunch of long flags creating a longer line, and made the first line shorter to handle the line starter text. New tarball as well, no man page changes. Not sure why this was left undone for so long, but here it is, nice and neat.
2013-01-18 22:22:58 +00:00
fi
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
if [[ $line_length -ge ${#temp_string} ]];then
flag_string=$temp_string
else
a_cpu_flags[$counter]=$flag_string
bug fix, forgot to add in a flag every loop
2014-03-15 04:00:30 +00:00
flag_string=$flag
Fixed cpu flag line print as well, uses arrays now, so no need to use numbered line outputs etc.
2008-12-05 05:54:07 +00:00
(( counter++ ))
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
fi
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
temp_string=''
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
done
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
if [[ -n $flag_string ]];then
a_cpu_flags[$counter]=$flag_string
fi
Fixed cpu flag line print as well, uses arrays now, so no need to use numbered line outputs etc.
2008-12-05 05:54:07 +00:00
# then print it out
for (( i=0; i < ${#a_cpu_flags[@]};i++ ))
do
New version. Updated dynamic sizing, fixed some glitches in cpu flags, fixed bugs in cpu main. Cleaned up a few more variable and width issues. Used a few more ${#var} for counting.
2014-03-15 03:41:16 +00:00
if [[ $i -gt 0 ]];then
Fixed cpu flag line print as well, uses arrays now, so no need to use numbered line outputs etc.
2008-12-05 05:54:07 +00:00
line_starter=''
fi
flag_data=$( create_print_line " " "$line_starter${a_cpu_flags[$i]}" )
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
print_screen_output "$flag_data"
Fixed cpu flag line print as well, uses arrays now, so no need to use numbered line outputs etc.
2008-12-05 05:54:07 +00:00
done
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
}
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
print_graphics_data()
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
local graphics_data='' card_id='' i='' root_alert='' root_x_string='' a_graphics_working=''
local b_is_mesa='false' display_full_string='' card_bus_id='' card_data=''
local res_tty='Resolution' xorg_data='' display_vendor_string='' chip_id=''
local spacer='' driver='' driver_string='' driver_plural='' direct_render_string=''
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
local separator_loaded='' separator_unloaded='' separator_failed=''
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
local loaded='' unloaded='' failed='' display_server_string=''
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
local line_starter='Graphics:' part_1_data='' part_2_data=''
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
local screen_resolution="$( get_graphics_res_data )"
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
# set A_DISPLAY_SERVER_DATA
get_graphics_display_server_data
local display_vendor=${A_DISPLAY_SERVER_DATA[0]}
local display_version=${A_DISPLAY_SERVER_DATA[1]}
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
# set A_GLX_DATA
get_graphics_glx_data
local glx_renderer="${A_GLX_DATA[0]}"
local glx_version="${A_GLX_DATA[1]}"
Finally tracked down and fixed the raijeken bug with wrong glx information showing, also added glx information for all cards, not just not free ones. After all, non free shouldn't show more information that free, that hardly seems fair.
2009-03-14 04:23:15 +00:00
# this can contain a long No case debugging message, so it's being sliced off
# note: using grep -ioE '(No|Yes)' <<< ${A_GLX_DATA[2]} did not work in Arch, no idea why
Major cleanup of print gfx data function, the logic there was broken, and had legacy methods that are no longer required. Simplified line constructor and used absolute tests for each part.
2011-05-04 21:08:56 +00:00
local glx_direct_render=$( gawk '{print $1}' <<< "${A_GLX_DATA[2]}" )
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
# set A_GRAPHICS_CARD_DATA
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
if [[ $BSD_TYPE == 'bsd' ]];then
if [[ $B_PCICONF_SET == 'false' ]];then
get_pciconf_data
fi
get_pciconf_card_data 'display'
else
get_graphics_card_data
fi
changed gfx drivers to use array for better output control, and also for future other gfx features
2011-05-25 01:53:20 +00:00
# set A_GRAPHIC_DRIVERS
get_graphics_driver
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
changed gfx drivers to use array for better output control, and also for future other gfx features
2011-05-25 01:53:20 +00:00
if [[ ${#A_GRAPHIC_DRIVERS[@]} -eq 0 ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
driver=' N/A'
changed gfx drivers to use array for better output control, and also for future other gfx features
2011-05-25 01:53:20 +00:00
else
for (( i=0; i < ${#A_GRAPHIC_DRIVERS[@]}; i++ ))
do
IFS=","
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
a_graphics_working=( ${A_GRAPHIC_DRIVERS[i]} )
changed gfx drivers to use array for better output control, and also for future other gfx features
2011-05-25 01:53:20 +00:00
IFS="$ORIGINAL_IFS"
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
case ${a_graphics_working[1]} in
new version, 1.5.11 Improved loaded/unloaded/failed output for gfx driver, now lists them by categor, ie: loaded: ati,radeon unloaded: fbdev This is because of the high count of loaded/unloaded drivers some systems show, especially for radeon/ati card types. Added logging for inxi in debugger data collector, and include now the log file, that should be of use.
2011-05-30 18:51:31 +00:00
loaded)
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
loaded="$loaded$separator_loaded${a_graphics_working[0]}"
new version, 1.5.11 Improved loaded/unloaded/failed output for gfx driver, now lists them by categor, ie: loaded: ati,radeon unloaded: fbdev This is because of the high count of loaded/unloaded drivers some systems show, especially for radeon/ati card types. Added logging for inxi in debugger data collector, and include now the log file, that should be of use.
2011-05-30 18:51:31 +00:00
separator_loaded=','
;;
unloaded)
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
unloaded="$unloaded$separator_unloaded${a_graphics_working[0]}"
new version, 1.5.11 Improved loaded/unloaded/failed output for gfx driver, now lists them by categor, ie: loaded: ati,radeon unloaded: fbdev This is because of the high count of loaded/unloaded drivers some systems show, especially for radeon/ati card types. Added logging for inxi in debugger data collector, and include now the log file, that should be of use.
2011-05-30 18:51:31 +00:00
separator_unloaded=','
;;
failed)
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
failed="$failed$separator_failed${a_graphics_working[0]}"
new version, 1.5.11 Improved loaded/unloaded/failed output for gfx driver, now lists them by categor, ie: loaded: ati,radeon unloaded: fbdev This is because of the high count of loaded/unloaded drivers some systems show, especially for radeon/ati card types. Added logging for inxi in debugger data collector, and include now the log file, that should be of use.
2011-05-30 18:51:31 +00:00
separator_failed=','
;;
esac
changed gfx drivers to use array for better output control, and also for future other gfx features
2011-05-25 01:53:20 +00:00
done
fi
new version, 1.5.11 Improved loaded/unloaded/failed output for gfx driver, now lists them by categor, ie: loaded: ati,radeon unloaded: fbdev This is because of the high count of loaded/unloaded drivers some systems show, especially for radeon/ati card types. Added logging for inxi in debugger data collector, and include now the log file, that should be of use.
2011-05-30 18:51:31 +00:00
if [[ -n $loaded ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
driver="$driver $loaded"
new version, 1.5.11 Improved loaded/unloaded/failed output for gfx driver, now lists them by categor, ie: loaded: ati,radeon unloaded: fbdev This is because of the high count of loaded/unloaded drivers some systems show, especially for radeon/ati card types. Added logging for inxi in debugger data collector, and include now the log file, that should be of use.
2011-05-30 18:51:31 +00:00
fi
if [[ -n $unloaded ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
driver="$driver (unloaded: $unloaded)"
new version, 1.5.11 Improved loaded/unloaded/failed output for gfx driver, now lists them by categor, ie: loaded: ati,radeon unloaded: fbdev This is because of the high count of loaded/unloaded drivers some systems show, especially for radeon/ati card types. Added logging for inxi in debugger data collector, and include now the log file, that should be of use.
2011-05-30 18:51:31 +00:00
fi
if [[ -n $failed ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
driver="$driver ${RED}FAILED$SEP3${C2} $failed"
new version, 1.5.11 Improved loaded/unloaded/failed output for gfx driver, now lists them by categor, ie: loaded: ati,radeon unloaded: fbdev This is because of the high count of loaded/unloaded drivers some systems show, especially for radeon/ati card types. Added logging for inxi in debugger data collector, and include now the log file, that should be of use.
2011-05-30 18:51:31 +00:00
fi
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
# sometimes for some reason there is no driver found but the array is started
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ -z $driver ]];then
driver=' N/A'
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
fi
changed gfx drivers to use array for better output control, and also for future other gfx features
2011-05-25 01:53:20 +00:00
if [[ ${#A_GRAPHIC_DRIVERS[@]} -gt 1 ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
driver_plural='s'
new: show active running x driver, that can work in or out of x, since it reads xorg log. New: split debugging data collector, now there is -@ 11 for /sys reads, and -@ 12, for xorg data output, including xprop -root, glxinfo, xdpyinfo, x version info, and related xorg files, including log data.
2011-05-23 22:23:06 +00:00
fi
(Change Version) Fixed long standing bug with root user getting null output for res or tty, now if in X, shows message that gfx data is not available to root. Also added null case handling for some of the gfx output to show N/A instead of null. This lets me know which detection fails, which should make debugging a bit easier long term. Turned off the advanced glx info line as well for root user.
2009-03-16 19:41:11 +00:00
# some basic error handling:
if [[ -z $screen_resolution ]];then
screen_resolution='N/A'
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
# note: fix this, we may find a display server that has no version
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ -z $display_vendor || -z $display_version ]];then
display_vendor_string="N/A"
(Change Version) Fixed long standing bug with root user getting null output for res or tty, now if in X, shows message that gfx data is not available to root. Also added null case handling for some of the gfx output to show N/A instead of null. This lets me know which detection fails, which should make debugging a bit easier long term. Turned off the advanced glx info line as well for root user.
2009-03-16 19:41:11 +00:00
else
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
display_vendor_string="$display_vendor $display_version"
Major cleanup of print gfx data function, the logic there was broken, and had legacy methods that are no longer required. Simplified line constructor and used absolute tests for each part.
2011-05-04 21:08:56 +00:00
fi
bug fix in output
2014-03-03 23:38:39 +00:00
display_server_string="${C1}Display Server${SEP3}${C2} $display_vendor_string "
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
driver_string="${C1}driver$driver_plural$SEP3${C2}$driver "
Major cleanup of print gfx data function, the logic there was broken, and had legacy methods that are no longer required. Simplified line constructor and used absolute tests for each part.
2011-05-04 21:08:56 +00:00
if [[ $B_ROOT == 'true' ]];then
root_x_string='for root '
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'false' || $B_CONSOLE_IRC == 'true' ]];then
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
res_tty='tty size'
(Change Version) Fixed long standing bug with root user getting null output for res or tty, now if in X, shows message that gfx data is not available to root. Also added null case handling for some of the gfx output to show N/A instead of null. This lets me know which detection fails, which should make debugging a bit easier long term. Turned off the advanced glx info line as well for root user.
2009-03-16 19:41:11 +00:00
fi
fi
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ $B_RUNNING_IN_DISPLAY != 'true' ]];then
Major cleanup of print gfx data function, the logic there was broken, and had legacy methods that are no longer required. Simplified line constructor and used absolute tests for each part.
2011-05-04 21:08:56 +00:00
root_x_string="${root_x_string}out of X"
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
res_tty='tty size'
Major cleanup of print gfx data function, the logic there was broken, and had legacy methods that are no longer required. Simplified line constructor and used absolute tests for each part.
2011-05-04 21:08:56 +00:00
fi
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
Major cleanup of print gfx data function, the logic there was broken, and had legacy methods that are no longer required. Simplified line constructor and used absolute tests for each part.
2011-05-04 21:08:56 +00:00
if [[ -n $root_x_string ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
root_x_string="${C1}Advanced Data$SEP3${C2} N/A $root_x_string"
Major cleanup of print gfx data function, the logic there was broken, and had legacy methods that are no longer required. Simplified line constructor and used absolute tests for each part.
2011-05-04 21:08:56 +00:00
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ ${#A_GRAPHICS_CARD_DATA[@]} -gt 0 ]];then
for (( i=0; i < ${#A_GRAPHICS_CARD_DATA[@]}; i++ ))
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
do
spring cleaning. Added as -x option for graphics card, busID output, that's useful. Moved the output error messaging to the print gfx function where it should be. I'll do that whereever the error messages were put in the get data functions, it' better to return null and let the print function decide what message to give users, that way we can always test for null values on anything we get from get data functions. I'll fix these as I spot them.
2011-04-25 20:00:53 +00:00
IFS=","
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
a_graphics_working=( ${A_GRAPHICS_CARD_DATA[i]} )
spring cleaning. Added as -x option for graphics card, busID output, that's useful. Moved the output error messaging to the print gfx function where it should be. I'll do that whereever the error messages were put in the get data functions, it' better to return null and let the print function decide what message to give users, that way we can always test for null values on anything we get from get data functions. I'll fix these as I spot them.
2011-04-25 20:00:53 +00:00
IFS="$ORIGINAL_IFS"
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
card_bus_id=''
card_data=${a_graphics_working[0]}
spring cleaning. Added as -x option for graphics card, busID output, that's useful. Moved the output error messaging to the print gfx function where it should be. I'll do that whereever the error messages were put in the get data functions, it' better to return null and let the print function decide what message to give users, that way we can always test for null values on anything we get from get data functions. I'll fix these as I spot them.
2011-04-25 20:00:53 +00:00
if [[ $B_EXTRA_DATA == 'true' ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ -n ${a_graphics_working[1]} ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
card_bus_id="${a_graphics_working[1]}"
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
if [[ $BSD_TYPE != 'bsd' ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=$( get_lspci_chip_id "${a_graphics_working[1]}" )
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
else
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=${a_graphics_working[2]}
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
fi
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
fi
spring cleaning. Added as -x option for graphics card, busID output, that's useful. Moved the output error messaging to the print gfx function where it should be. I'll do that whereever the error messages were put in the get data functions, it' better to return null and let the print function decide what message to give users, that way we can always test for null values on anything we get from get data functions. I'll fix these as I spot them.
2011-04-25 20:00:53 +00:00
else
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
card_bus_id='N/A'
spring cleaning. Added as -x option for graphics card, busID output, that's useful. Moved the output error messaging to the print gfx function where it should be. I'll do that whereever the error messages were put in the get data functions, it' better to return null and let the print function decide what message to give users, that way we can always test for null values on anything we get from get data functions. I'll fix these as I spot them.
2011-04-25 20:00:53 +00:00
fi
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
if [[ -n $card_bus_id ]];then
card_bus_id="${C1}bus-ID$SEP3${C2} $card_bus_id "
fi
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ -n $chip_id ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
chip_id="${C1}chip-ID$SEP3${C2} $chip_id"
added A and G vendor:product output for xx, this also requires redoing the line length counters
2012-10-19 18:37:09 +00:00
fi
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ ${#A_GRAPHICS_CARD_DATA[@]} -gt 1 ]];then
fixed a few more small glitches
2014-03-17 04:28:45 +00:00
card_id="-$(($i+1))"
spring cleaning. Added as -x option for graphics card, busID output, that's useful. Moved the output error messaging to the print gfx function where it should be. I'll do that whereever the error messages were put in the get data functions, it' better to return null and let the print function decide what message to give users, that way we can always test for null values on anything we get from get data functions. I'll fix these as I spot them.
2011-04-25 20:00:53 +00:00
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
part_1_data="${C1}Card$card_id$SEP3${C2} $card_data "
part_2_data="$card_bus_id$chip_id"
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ ${#A_GRAPHICS_CARD_DATA[@]} -gt 1 ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
if [[ $( calculate_line_length "$part_1_data$part_2_data" ) -gt $COLS_INNER ]];then
graphics_data=$( create_print_line "$line_starter" "$part_1_data" )
print_screen_output "$graphics_data"
part_1_data=''
line_starter=' '
fi
if [[ -n $( grep -vE '^[[:space:]]*$' <<< $part_1_data$part_2_data ) ]];then
graphics_data=$( create_print_line "$line_starter" "$part_1_data$part_2_data" )
print_screen_output "$graphics_data"
fi
part_1_data=''
part_2_data=''
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
line_starter=' '
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
graphics_data=''
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
fi
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
done
spring cleaning. Added as -x option for graphics card, busID output, that's useful. Moved the output error messaging to the print gfx function where it should be. I'll do that whereever the error messages were put in the get data functions, it' better to return null and let the print function decide what message to give users, that way we can always test for null values on anything we get from get data functions. I'll fix these as I spot them.
2011-04-25 20:00:53 +00:00
# handle cases where card detection fails, like in PS3, where lspci gives no output, or headless boxes..
else
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
part_1_data="${C1}Card$SEP3${C2} Failed to Detect Video Card! "
Initial setup of repo
2008-10-28 00:40:43 +00:00
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
# Print cards if not dual card system
if [[ -n $part_1_data$part_2_data ]];then
if [[ $( calculate_line_length "$part_1_data$part_2_data" ) -gt $COLS_INNER ]];then
graphics_data=$( create_print_line "$line_starter" "$part_1_data" )
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
print_screen_output "$graphics_data"
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
part_1_data=''
next step in fix
2011-05-25 22:04:21 +00:00
line_starter=' '
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
if [[ -n $( grep -vE '^[[:space:]]*$' <<< $part_1_data$part_2_data ) ]];then
graphics_data=$( create_print_line "$line_starter" "$part_1_data$part_2_data" )
print_screen_output "$graphics_data"
fi
fi
line_starter=' '
graphics_data=''
part_1_data="$display_server_string$driver_string"
part_2_data="${C1}$res_tty$SEP3${C2} $screen_resolution $root_x_string"
if [[ -n $( grep -vE '^[[:space:]]*$' <<< $part_1_data$part_2_data ) && \
$( calculate_line_length "$part_1_data $part_2_data" ) -gt $COLS_INNER ]];then
graphics_data=$( create_print_line "$line_starter" "$part_1_data" )
print_screen_output "$graphics_data"
line_starter=' '
part_1_data=''
graphics_data=$part_2_data
fi
if [[ -n $( grep -vE '^[[:space:]]*$' <<< $part_1_data$part_2_data ) ]];then
graphics_data=$( create_print_line "$line_starter" "$part_1_data$part_2_data" )
print_screen_output "$graphics_data"
line_starter=' '
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
fi
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
# if [[ -z $glx_renderer || -z $glx_version ]];then
# b_is_mesa='true'
# fi
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
## note: if glx render or display_version have no content, then mesa is true
# if [[ $B_SHOW_DISPLAY_DATA == 'true' ]] && [[ $b_is_mesa != 'true' ]];then
if [[ $B_SHOW_DISPLAY_DATA == 'true' && $B_ROOT != 'true' ]];then
(Change Version) Fixed long standing bug with root user getting null output for res or tty, now if in X, shows message that gfx data is not available to root. Also added null case handling for some of the gfx output to show N/A instead of null. This lets me know which detection fails, which should make debugging a bit easier long term. Turned off the advanced glx info line as well for root user.
2009-03-16 19:41:11 +00:00
if [[ -z $glx_renderer ]];then
glx_renderer='N/A'
fi
if [[ -z $glx_version ]];then
glx_version='N/A'
fi
if [[ -z $glx_direct_render ]];then
glx_direct_render='N/A'
fi
Finally tracked down and fixed the raijeken bug with wrong glx information showing, also added glx information for all cards, not just not free ones. After all, non free shouldn't show more information that free, that hardly seems fair.
2009-03-14 04:23:15 +00:00
if [[ $B_HANDLE_CORRUPT_DATA == 'true' || $B_EXTRA_DATA == 'true' ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
direct_render_string=" ${C1}Direct Rendering$SEP3${C2} $glx_direct_render"
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
part_1_data="${C1}GLX Renderer$SEP3${C2} $glx_renderer "
part_2_data="${C1}GLX Version$SEP3${C2} $glx_version$direct_render_string"
# echo $line_starter
if [[ $( calculate_line_length "$part_1_data$part_2_data" ) -gt $COLS_INNER ]];then
graphics_data=$( create_print_line "$line_starter" "$part_1_data" )
print_screen_output "$graphics_data"
part_1_data=''
line_starter=' '
fi
if [[ -n $part_1_data$part_2_data ]];then
graphics_data=$( create_print_line "$line_starter" "$part_1_data$part_2_data" )
print_screen_output "$graphics_data"
fi
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
}
Initial setup of repo
2008-10-28 00:40:43 +00:00
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
print_hard_disk_data()
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
svn ci error, change version, line wrapping for hard disk output, bug fixes in print out sections.
2009-08-07 00:04:04 +00:00
local hdd_data='' hdd_data_2='' a_hdd_working='' hdd_temp_data='' hdd_string=''
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
local hdd_serial=''
typo fix
2009-08-07 00:24:15 +00:00
local dev_data='' size_data='' hdd_model='' usb_data='' hdd_name='' divisor=5
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
local Line_Starter='Drives:' # inherited by print_optical_drives
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
# load A_HDD_DATA
get_hdd_data_basic
## note: if hdd_model is declared prior to use, whatever string you want inserted will
## be inserted first. In this case, it's desirable to print out (x) before each disk found.
local a_hdd_data_count=$(( ${#A_HDD_DATA[@]} - 1 ))
IFS=","
local a_hdd_basic_working=( ${A_HDD_DATA[$a_hdd_data_count]} )
IFS="$ORIGINAL_IFS"
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
local hdd_capacity="${a_hdd_basic_working[0]}"
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
local hdd_used=${a_hdd_basic_working[1]}
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
local bsd_unsupported='Hard drive data not yet supported for BSD systems.'
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
local hdd_name_temp=''
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $B_SHOW_BASIC_DISK == 'true' || $B_SHOW_DISK == 'true' ]];then
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
## note: the output part of this should be in the print hdd data function, not here
get_hard_drive_data_advanced
for (( i=0; i < ${#A_HDD_DATA[@]} - 1; i++ ))
do
# this adds the (x) numbering in front of each disk found, and creates the full disk string
IFS=","
a_hdd_working=( ${A_HDD_DATA[i]} )
IFS="$ORIGINAL_IFS"
Version update. Redid -v options totally. Added -v 6 for full partition and unmounted partition output. Adjusted the 2-5 options to include the various new features that have been added recently. Got rid of the entire old way of using verbosity level numbers internally in the script to trigger events, now all those printout triggers are done via clearly named global switch variables which are set in the initial Option selector function only. This should not make any particular difference to users, but it makes it easier to read the printout logic code, and to see what full/basic/verbosity level output actually is going to do. Also changed -d to -b, and added an error handler to -d showing it's been deprecated. -d will be needed in the future for advanced -D data, probably cd/dvd etc, and I want to keep the consistency, as much as possible, that is, m will be advanced M data, p is advanced P, n is advanced N, and so on. I know this breaks some people's habits, but I think with the deprecated option warning/error, it should be fine, and it's best to get this done now than to wait until inxi actually is going to use the -d advanced disk option. Ok, that's it, just basically a code clean up version.
2011-06-09 23:27:05 +00:00
if [[ $B_SHOW_DISK == 'true' ]];then
Added array item, usb, for advanced hard disk output
2008-11-08 21:56:16 +00:00
if [[ -n ${a_hdd_working[3]} ]];then
Made (usb) to USB to make more readable
2008-11-09 20:28:26 +00:00
usb_data="${a_hdd_working[3]} "
Added array item, usb, for advanced hard disk output
2008-11-08 21:56:16 +00:00
else
usb_data=''
fi
Cleaned up some testing cases, removed and cleaned up comments, tweaked the full hard drive output a bit
2008-11-09 20:20:23 +00:00
dev_data="/dev/${a_hdd_working[0]} "
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
size_data=" ${C1}size$SEP3${C2} ${a_hdd_working[1]}"
code cleanup
2009-08-07 00:07:41 +00:00
if [[ $B_EXTRA_DATA == 'true' && -n $dev_data ]];then
hdd_temp_data=$( get_hdd_temp_data "$dev_data" )
# error handling is done in get data function
if [[ -n $hdd_temp_data ]];then
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
hdd_temp_data=" ${C1}temp$SEP3${C2} ${hdd_temp_data}C"
code cleanup
2009-08-07 00:07:41 +00:00
else
hdd_temp_data=''
fi
(change version) small new feature: show with -x, extra options, hddtemp data for -D data, if hddtemp installed, and if user root, or if user is in /etc/sudoers with: <username> ALL = NOPASSWD: /usr/sbin/hddtemp Another nice little sys admin thing.
2009-08-03 03:57:20 +00:00
fi
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
hdd_serial=$( get_hdd_serial_number "${a_hdd_working[0]}" )
if [[ -z $hdd_serial ]];then
hdd_serial='N/A'
fi
hdd_serial=" ${C1}serial$SEP3${C2} $hdd_serial"
divisor=1 # print every line
else
divisor=2 # for modulus line print out, either 2 items for full, or default for short
fi
dev_data="${C1}id$SEP3${C2} /dev/${a_hdd_working[0]} "
bug fixes, tweaks, code cleanups for hdd printout
2009-08-07 00:22:17 +00:00
fi
new version, new tarball. Added support for openSUSE repo syntax/location, as long as it's zypp or yum it will work. If it's both then it will show only one I believe, if that's a possible scenario, no idea. Added one more fix for those pesky intel vm cpu core errors, now if /proc/cpuinfo shows no siblings at all, and no core_id, but does have physical id, it will use the count for physical id as a default for core count. Not perfect, but better than calling a dual core cpu a single core. There's still a lot of mysteries with vm versions of kvm cpus, for example, if you see a dual core xeon, is that actually one core with ht, or two cores? There is no way to find that information out that I can see that is reliable.
2013-06-16 20:59:53 +00:00
if [[ -n ${a_hdd_working[2]} ]];then
hdd_name_temp=${a_hdd_working[2]}
else
hdd_name_temp='N/A'
fi
hdd_name="${C1}model$SEP3${C2} $hdd_name_temp"
new -xx feature, by request, -D shows serial number of hdd as well. Also fixed the drive output to be more clearly labeled with data type names, as with the rest of the outputs.
2012-04-26 23:51:55 +00:00
hdd_string="$usb_data$dev_data$hdd_name$size_data$hdd_serial$hdd_temp_data"
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
hdd_model="$hdd_model${C1}$(($i+1))$SEP3${C2} $hdd_string "
logic cleanup in printout function for hdd data
2009-08-07 00:51:10 +00:00
# printing line one, then new lines according to $divisor setting, and after, if leftovers, print that line.
case $i in
0)
small change, with -xx, now inxi shows one driver per line, but shows the total disk space on a separate line that makes it a bit more readable. New version number, new tarball. I debated making it one per line default as soon as -x is triggered but will leave it this way for now, with -xx you get the easier to read single line output in all cases, so that's probably good enough.
2012-07-01 21:35:19 +00:00
if [[ $divisor -eq 1 ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
hdd_data=$( create_print_line "$Line_Starter" "${C1}HDD Total Size$SEP3${C2} $hdd_capacity ($hdd_used)" )
small change, with -xx, now inxi shows one driver per line, but shows the total disk space on a separate line that makes it a bit more readable. New version number, new tarball. I debated making it one per line default as soon as -x is triggered but will leave it this way for now, with -xx you get the easier to read single line output in all cases, so that's probably good enough.
2012-07-01 21:35:19 +00:00
print_screen_output "$hdd_data"
Line_Starter=' '
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
hdd_data=$( create_print_line "$Line_Starter" "$hdd_model" )
small change, with -xx, now inxi shows one driver per line, but shows the total disk space on a separate line that makes it a bit more readable. New version number, new tarball. I debated making it one per line default as soon as -x is triggered but will leave it this way for now, with -xx you get the easier to read single line output in all cases, so that's probably good enough.
2012-07-01 21:35:19 +00:00
print_screen_output "$hdd_data"
hdd_model=''
else
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
hdd_data=$( create_print_line "$Line_Starter" "${C1}HDD Total Size$SEP3${C2} $hdd_capacity ($hdd_used) $hdd_model" )
small change, with -xx, now inxi shows one driver per line, but shows the total disk space on a separate line that makes it a bit more readable. New version number, new tarball. I debated making it one per line default as soon as -x is triggered but will leave it this way for now, with -xx you get the easier to read single line output in all cases, so that's probably good enough.
2012-07-01 21:35:19 +00:00
print_screen_output "$hdd_data"
hdd_model=''
Line_Starter=' '
fi
logic cleanup in printout function for hdd data
2009-08-07 00:51:10 +00:00
;;
*)
# using modulus here, if divisible by $divisor, print line, otherwise skip
if [[ $(( $i % $divisor )) -eq 0 ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
hdd_data=$( create_print_line "$Line_Starter" "$hdd_model" )
svn ci error, change version, line wrapping for hard disk output, bug fixes in print out sections.
2009-08-07 00:04:04 +00:00
print_screen_output "$hdd_data"
hdd_model=''
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
Line_Starter=' '
logic cleanup in printout function for hdd data
2009-08-07 00:51:10 +00:00
fi
;;
esac
Redid the hdd data stuff, split it into basic and advanced functions for main loading of data array, then further population of it for -v levels > 2. With -x option, also puts out /dev/[hs]dx and drive size as well, per drive
2008-11-08 04:50:09 +00:00
done
svn ci error, change version, line wrapping for hard disk output, bug fixes in print out sections.
2009-08-07 00:04:04 +00:00
# then print any leftover items
if [[ -n $hdd_model ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
hdd_data=$( create_print_line "$Line_Starter" "$hdd_model${CN}" )
svn ci error, change version, line wrapping for hard disk output, bug fixes in print out sections.
2009-08-07 00:04:04 +00:00
print_screen_output "$hdd_data"
Fixed long line wraps, rearranged hard disk info
2008-11-08 06:06:08 +00:00
fi
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
# temporary message to indicate not yet supported
if [[ $BSD_TYPE == 'bsd' ]];then
hdd_data=$bsd_unsupported
hdd_data=$( create_print_line "$Line_Starter" "$hdd_data${CN}" )
print_screen_output "$hdd_data"
Line_Starter=' '
fi
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
else
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
# temporary message to indicate not yet supported
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
hdd_data="${C1}HDD Total Size$SEP3${C2} $hdd_capacity ($hdd_used)"
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
if [[ $BSD_TYPE == 'bsd' ]];then
hdd_data=$bsd_unsupported
fi
hdd_data=$( create_print_line "$Line_Starter" "$hdd_data${CN}" )
svn ci error, change version, line wrapping for hard disk output, bug fixes in print out sections.
2009-08-07 00:04:04 +00:00
print_screen_output "$hdd_data"
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
Line_Starter=' '
fi
fixed a bug
2011-06-18 03:49:53 +00:00
if [[ $B_SHOW_FULL_OPTICAL == 'true' || $B_SHOW_BASIC_OPTICAL == 'true' ]];then
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
print_optical_drive_data
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
fi
svn ci error, change version, line wrapping for hard disk output, bug fixes in print out sections.
2009-08-07 00:04:04 +00:00
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
(Change Version) 1. Fixed help menu bug, now if unsupported option, error prints out full list of options used so people can see what the wrong option was. 2. Refactored print_hdd_data, and split out print_hdd_partition_data to make it cleaner, and added triggers to primary print output function directly, instead of embedding them in the hdd print function. 3. Moved print_it_out to top of print functions, and made better comments to show how it works.
2008-11-10 17:57:52 +00:00
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
print_info_data()
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
local info_data='' line_starter='Info:' runlvl_default='' runlvl='' runlvl_title='runlevel'
local init_data='' init_type='' init_version='' rc_type='' rc_version=''
local client_data='' shell_data='' shell_parent='' tty_session=''
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
local memory="$( get_memory_data )"
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
local processes=$(( $( wc -l <<< "$Ps_aux_Data" ) - 1 ))
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
local up_time="$( get_uptime )"
New version, new tarball. All bug fixes and cleanup preparing to support bsd systems, including kfreebsd from Debian. Cleaned up all sed and grep that will be used by bsds, added more granular flag for bsd types. Cleaned up and corrected issues between bsd/linux, more escapes and tests added to drop error counts in bsds. Please note that you must use the inxi from branches/bsd for true bsds because sed has extra -i '' added, and has the proper #!/usr/local/bin/bash Added -! 16 for gnubsd download/update, that's for gnu bsd systems like gnu/kfreebsd from debian. That retains the top #!/bin/bash path, and also uses gnu sed so no -i '' syntax. Moved some grep -o to gawk or sed to avoid using gnu grep unnecessarily, leaving gnu grep where it will be linux only, for example parsing a /proc file. Fixed tty irc bugs for bsds and linux, now should show the right console size for both, ideally.
2013-02-09 04:43:18 +00:00
local patch_version_number=$( get_patch_version_string )
New version, new tarball, new man page. Fixed an old bug where if you start inxi with an ssh command sometimes it will not show any client information, just the debugger PPID output. Now it will test as a final check to see if it can detect any parent to the process. Actually grandparent I believe. Seems to work, it's a fringe case but why not handle it? New -xx feature, for -I it will show, if inxi is not running in IRC client and if is running in X, and if the grandparent is not 'login', will show the application the shell is running in. Example: Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3 Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6 Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
2013-01-29 00:03:06 +00:00
local gcc_string='' gcc_installed='' gcc_others='' closing_data=''
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
if [[ -z $memory ]];then
memory='N/A'
fi
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
if [[ $B_EXTRA_DATA == 'true' ]];then
get_gcc_system_version
if [[ ${#A_GCC_VERSIONS[@]} -gt 0 ]];then
if [[ -n ${A_GCC_VERSIONS[0]} ]];then
gcc_installed=${A_GCC_VERSIONS[0]}
adjustment
2011-07-06 01:22:11 +00:00
else
gcc_installed='N/A'
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
fi
if [[ $B_EXTRA_EXTRA_DATA == 'true' && -n ${A_GCC_VERSIONS[1]} ]];then
New version. Some BSD fixes, and a more important fix, added 'display controller' to graphics card detection, that's a new one on me. Dual card systems might use this. 00:02.0 Display controller: Intel Corporation 82865G Integrated Graphics Controller (rev 02) 01:00.0 VGA compatible controller: NVIDIA Corporation NV44A [GeForce 6200] (rev a1) Some more switches to bash native methods as well.
2014-03-18 02:26:26 +00:00
# gcc_others=" ${C1}alt$SEP3${C2} $( tr ',' '/' <<< ${A_GCC_VERSIONS[1]} )"
gcc_others=" ${C1}alt$SEP3${C2} ${A_GCC_VERSIONS[1]//,//}"
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
gcc_installed="${C1}Gcc sys$SEP3${C2} $gcc_installed$gcc_others "
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
fi
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'false' ]];then
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
shell_data=$( get_shell_data )
if [[ -n $shell_data ]];then
New version, new tarball, new man page. Fixed an old bug where if you start inxi with an ssh command sometimes it will not show any client information, just the debugger PPID output. Now it will test as a final check to see if it can detect any parent to the process. Actually grandparent I believe. Seems to work, it's a fringe case but why not handle it? New -xx feature, for -I it will show, if inxi is not running in IRC client and if is running in X, and if the grandparent is not 'login', will show the application the shell is running in. Example: Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3 Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6 Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
2013-01-29 00:03:06 +00:00
# note, if you start this in tty, it will give 'login' as the parent, which we don't want.
new version, new tarball, new man page. small change -Ixx will show running in tty if it's not in X, with tty number. sort of redundant to System: console: data, but that's ok, we'll live for now.
2013-01-29 00:22:50 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ $B_RUNNING_IN_DISPLAY != 'true' ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
shell_parent=$( get_tty_number )
new version, new tarball, new man page. small change -Ixx will show running in tty if it's not in X, with tty number. sort of redundant to System: console: data, but that's ok, we'll live for now.
2013-01-29 00:22:50 +00:00
shell_parent="tty $shell_parent"
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
else
shell_parent=$( get_shell_parent )
new version, new tarball, new man page. small change -Ixx will show running in tty if it's not in X, with tty number. sort of redundant to System: console: data, but that's ok, we'll live for now.
2013-01-29 00:22:50 +00:00
fi
New version, new tarball, new man page. Fixed an old bug where if you start inxi with an ssh command sometimes it will not show any client information, just the debugger PPID output. Now it will test as a final check to see if it can detect any parent to the process. Actually grandparent I believe. Seems to work, it's a fringe case but why not handle it? New -xx feature, for -I it will show, if inxi is not running in IRC client and if is running in X, and if the grandparent is not 'login', will show the application the shell is running in. Example: Info: Processes: 271 Uptime: 5:36 Memory: 3255.8/4048.5MB Runlevel: 3 Gcc sys: 4.7.2 alt: 4.0/4.2/4.4/4.5/4.6 Client: Shell (bash 4.2.37 - started in konsole) inxi: 1.8.33
2013-01-29 00:03:06 +00:00
if [[ $shell_parent == 'login' ]];then
shell_parent=''
elif [[ -n $shell_parent ]];then
shell_parent=" running in $shell_parent"
fi
fi
IRC_CLIENT="$IRC_CLIENT ($shell_data$shell_parent)"
new version, fixed a weak shell handler, now it shows the actual shell that inxi started in if not irc. Also added -x option, show shell version number as well. For dash/csh, this uses a hack of getting dpkg version, which covers many users, but not all, hopefully I can find a universal way to get shell version for dash/csh
2012-12-05 21:34:56 +00:00
fi
new version, new tarball, a long time oversight, now if running in shell, shows the shell type, like bash, zsh, etc instead of just the plain 'shell'.
2012-11-20 05:00:15 +00:00
fi
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
# Some code could look superfluous but BitchX doesn't like lines not ending in a newline. F*&k that bitch!
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# long_last=$( echo -ne "${C1}Processes$SEP3${C2} $processes${CN} | ${C1}Uptime$SEP3${C2} $up_time${CN} | ${C1}Memory$SEP3${C2} $MEM${CN}" )
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
info_data="${C1}Processes$SEP3${C2} $processes ${C1}Uptime$SEP3${C2} $up_time ${C1}Memory$SEP3${C2} $memory "
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
# this only triggers if no X data is present or if extra data switch is on
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ $B_SHOW_DISPLAY_DATA != 'true' || $B_EXTRA_DATA == 'true' ]];then
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
get_init_data
if [[ ${A_INIT_DATA[0]} == 'systemd' && -z $( grep -E '^[0-9]$' <<< ${A_INIT_DATA[4]} ) ]];then
runlvl_title='target'
fi
init_type=${A_INIT_DATA[0]}
if [[ -z $init_type ]];then
init_type='N/A'
fi
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
init_version=${A_INIT_DATA[1]}
if [[ -z $init_version ]];then
init_version='N/A'
fi
init_version=" ${C1}v$SEP3${C2} $init_version"
rc_version=${A_INIT_DATA[3]}
if [[ -n $rc_version ]];then
rc_version=" ${C1}v$SEP3${C2} $rc_version"
fi
runlvl_default=${A_INIT_DATA[5]}
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
fi
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
# currently only using openrc here, otherwise show nothing
rc_type=${A_INIT_DATA[2]}
if [[ -n $rc_type ]];then
rc_type=" ${C1}rc$SEP3${C2} $rc_type$rc_version"
fi
init_type="${C1}Init$SEP3${C2} $init_type$init_version "
runlvl=${A_INIT_DATA[4]}
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
if [[ -n $runlvl ]];then
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
runlvl="${C1}$runlvl_title$SEP3${C2} $runlvl "
fi
if [[ -n $runlvl_default ]];then
runlvl_default="${C1}default$SEP3${C2} $runlvl_default "
Correct runlevel check
2008-12-16 23:12:27 +00:00
fi
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
init_data="$init_type$rc_type$runlvl$runlvl_default"
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
fi
if [[ $SHOW_IRC -gt 0 ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
client_data="${C1}Client$SEP3${C2} $IRC_CLIENT$IRC_CLIENT_VERSION "
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
# info_data="$info_data"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
closing_data="$client_data${C1}$SCRIPT_NAME$SEP3${C2} $SCRIPT_VERSION_NUMBER$patch_version_number"
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
# sometimes gcc is very long, and default runlevel can be long with systemd, so create a gcc-less line first
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $( calculate_line_length "$info_data$init_data$gcc_installed" ) -gt $COLS_INNER ]];then
# info_data=$info_data
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
info_data=$( create_print_line "$line_starter" "$info_data${CN}" )
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
print_screen_output "$info_data"
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
info_data=''
# closing_data=''
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
line_starter=' '
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
#echo 1
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $( calculate_line_length "$init_data$gcc_installed" ) -gt $COLS_INNER ]];then
info_data=$init_data
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
info_data=$( create_print_line "$line_starter" "$info_data${CN}" )
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
print_screen_output "$info_data"
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
info_data=''
init_data=''
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
line_starter=' '
New feature, not new line option though. Now shows init type with -x (also shows rc type if openrc). -xx shows init / rc version number. Change runlevel to target if systemd and if non numeric runlevel given. Should support systemd/upstart/epoch/runit sysvinit. Supports openrc as extra data if it's present. Rearranged -I line a bit but really just exchanged Runlevel: for Init: v: Runlevel: default: This is the first step, some of the init system ID methods are weak and non robust and this may need to be revised, but it should for now identify systemd/upstart quite accurately, and in most cases sysvinit. Note that to get sysvinit version number requires tool: strings which in debian/ubuntu is in package binutils. I don't know the package names for arch/fedora/etc for the recommends check tool in inxi yet. I believe this will be good enough for a first draft version, but over time we'll get it more fine tuned, but as it is now, it should cover at least 99% of users, which isn't bad.
2014-03-13 00:18:26 +00:00
#echo 2
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $( calculate_line_length "$info_data$init_data$gcc_installed$closing_data" ) -gt $COLS_INNER ]];then
info_data=$info_data$init_data$gcc_installed
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
info_data=$( create_print_line "$line_starter" "$info_data${CN}" )
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_screen_output "$info_data"
info_data=''
gcc_installed=''
init_data=''
line_starter=' '
#echo 3
fi
info_data="$info_data$init_data$gcc_installed$closing_data"
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
info_data=$( create_print_line "$line_starter" "$info_data${CN}" )
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
if [[ $SCHEME -gt 0 ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
info_data="$info_data ${NORMAL}"
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
fi
print_screen_output "$info_data"
New version; new tarball; new man page. Added Unity desktop support; added -xx feature to show default runlevel, using systemd/upstart/sysvinit type default tests. Fixed gtk library version detections, now will support dpkg/pacman version tests, which should give more data to more people than previously, where the old tests usually would return null unless gtk dev packages were installed on the system.
2014-01-13 23:01:03 +00:00
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
}
new version, bug fix, adding 3D controller to output causes doubled card id in some cases.
2014-03-19 02:19:31 +00:00
#print_info_data;exit
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
print_machine_data()
{
eval $LOGFS
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
local system_line='' mobo_line='' bios_line='' chassis_line=''
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
local mobo_vendor='' mobo_model='' mobo_version='' mobo_serial=''
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
local bios_vendor='' bios_version='' bios_date='' bios_rom=''
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
local system_vendor='' product_name='' product_version='' product_serial='' product_uuid=''
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
local chassis_vendor='' chassis_type='' chassis_version='' chassis_serial=''
bug fix, added system line
2011-06-08 03:01:49 +00:00
local b_skip_system='false' b_skip_chassis='false'
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
local sysDmiError='No /sys/class/dmi, using '
local sysDmiNull='No /sys/class/dmi machine data: try newer kernel, or install dmidecode'
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
# set A_MACHINE_DATA
get_machine_data
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
if [[ -n $BSD_TYPE ]];then
sysDmiError=''
sysDmiNull='No machine data available. Is dmidecode installed?'
fi
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
IFS=','
## keys for machine data are:
# 0-sys_vendor 1-product_name 2-product_version 3-product_serial 4-product_uuid
# 5-board_vendor 6-board_name 7-board_version 8-board_serial
# 9-bios_vendor 10-bios_version 11-bios_date
## with extra data:
# 12-chassis_vendor 13-chassis_type 14-chassis_version 15-chassis_serial
if [[ ${#A_MACHINE_DATA[@]} -gt 0 ]];then
# note: in some case a mobo/version will match a product name/version, do not print those
more bug fixes, simplified logic
2011-06-08 06:17:03 +00:00
# but for laptops, or even falsely id'ed desktops with batteries, let's print it all if it matches
final bug fixes, if google svn ever starts working again
2011-06-08 08:42:28 +00:00
# there can be false id laptops if battery appears so need to make sure system is filled
if [[ -z ${A_MACHINE_DATA[0]} ]];then
b_skip_system='true'
else
added more wifi detection filters
2011-06-09 01:51:46 +00:00
if [[ $B_PORTABLE != 'true' ]];then
final bug fixes, if google svn ever starts working again
2011-06-08 08:42:28 +00:00
# ibm / ibm can be true; dell / quantum is false, so in other words, only do this
# in case where the vendor is the same and the version is the same and not null,
# otherwise the version information is going to be different in all cases I think
if [[ -n ${A_MACHINE_DATA[0]} && ${A_MACHINE_DATA[0]} == ${A_MACHINE_DATA[5]} ]];then
if [[ -n ${A_MACHINE_DATA[2]} && ${A_MACHINE_DATA[2]} == ${A_MACHINE_DATA[7]} ]] || \
[[ -z ${A_MACHINE_DATA[2]} && ${A_MACHINE_DATA[1]} == ${A_MACHINE_DATA[6]} ]];then
b_skip_system='true'
fi
maybe bug fix for gigabyte board
2011-06-08 07:58:46 +00:00
fi
trying another way of handling false system/mobo data matches, msi is the culprit here
2011-06-08 05:13:55 +00:00
fi
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
fi
trying a fix for false system/mobo difference
2011-06-08 04:38:39 +00:00
# no point in showing chassis if system isn't there, it's very unlikely that would be correct
bug fixes for chassis
2011-06-08 04:14:31 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' && $b_skip_system != 'true' ]];then
more bug fixes, simplified logic
2011-06-08 06:17:03 +00:00
if [[ -n ${A_MACHINE_DATA[7]} && ${A_MACHINE_DATA[14]} == ${A_MACHINE_DATA[7]} ]];then
bug fix, added system line
2011-06-08 03:01:49 +00:00
b_skip_chassis='true'
fi
if [[ -n ${A_MACHINE_DATA[12]} && $b_skip_chassis != 'true' ]];then
tweaks, clean up chassis output
2011-06-08 09:22:40 +00:00
# no need to print the vendor string again if it's the same
if [[ ${A_MACHINE_DATA[12]} != ${A_MACHINE_DATA[0]} ]];then
chassis_vendor=" ${A_MACHINE_DATA[12]}"
fi
bug fix, added system line
2011-06-08 03:01:49 +00:00
if [[ -n ${A_MACHINE_DATA[13]} ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
chassis_type=" ${C1}type$SEP3${C2} ${A_MACHINE_DATA[13]}"
bug fix, added system line
2011-06-08 03:01:49 +00:00
fi
if [[ -n ${A_MACHINE_DATA[14]} ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
chassis_version=" ${C1}v$SEP3${C2} ${A_MACHINE_DATA[14]}"
bug fix, added system line
2011-06-08 03:01:49 +00:00
fi
if [[ -n ${A_MACHINE_DATA[15]} && $B_OUTPUT_FILTER != 'true' ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
chassis_serial=" ${C1}serial$SEP3${C2} ${A_MACHINE_DATA[15]}"
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
fi
tweaks, clean up chassis output
2011-06-08 09:22:40 +00:00
if [[ -n "$chassis_vendor$chassis_type$chassis_version$chassis_serial" ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
chassis_line="${C1}Chassis$SEP3${C2}$chassis_vendor$chassis_type$chassis_version$chassis_serial"
tweaks, clean up chassis output
2011-06-08 09:22:40 +00:00
fi
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
fi
fi
if [[ -n ${A_MACHINE_DATA[5]} ]];then
mobo_vendor=${A_MACHINE_DATA[5]}
else
mobo_vendor='N/A'
fi
if [[ -n ${A_MACHINE_DATA[6]} ]];then
mobo_model=${A_MACHINE_DATA[6]}
else
mobo_model='N/A'
fi
if [[ -n ${A_MACHINE_DATA[7]} ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
mobo_version=" ${C1}v$SEP3${C2} ${A_MACHINE_DATA[7]}"
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
fi
if [[ -n ${A_MACHINE_DATA[8]} && $B_OUTPUT_FILTER != 'true' ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
mobo_serial=" ${C1}serial$SEP3${C2} ${A_MACHINE_DATA[8]}"
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
fi
if [[ -n ${A_MACHINE_DATA[9]} ]];then
bios_vendor=${A_MACHINE_DATA[9]}
else
bios_vendor='N/A'
fi
if [[ -n ${A_MACHINE_DATA[10]} ]];then
bios_version=${A_MACHINE_DATA[10]}
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
if [[ -n ${A_MACHINE_DATA[16]} ]];then
bios_version="$bios_version rv ${A_MACHINE_DATA[16]}"
fi
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
else
bios_version='N/A'
fi
if [[ -n ${A_MACHINE_DATA[11]} ]];then
bios_date=${A_MACHINE_DATA[11]}
else
bios_date='N/A'
fi
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' && -n ${A_MACHINE_DATA[17]} ]];then
bios_rom=" ${C1}rom size$SEP3${C2} ${A_MACHINE_DATA[17]}"
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
mobo_line="${C1}Mobo$SEP3${C2} $mobo_vendor ${C1}model$SEP3${C2} $mobo_model$mobo_version$mobo_serial"
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
bios_line="${C1}Bios$SEP3${C2} $bios_vendor ${C1}v$SEP3${C2} $bios_version ${C1}date$SEP3${C2} $bios_date$bios_rom"
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
if [[ $( calculate_line_length "$mobo_line$bios_line" ) -lt $COLS_INNER ]];then
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
mobo_line="$mobo_line $bios_line"
bios_line=''
fi
if [[ $b_skip_system == 'true' ]];then
system_line=$mobo_line
mobo_line=''
else
more bug fixes, simplified logic
2011-06-08 06:17:03 +00:00
# this has already been tested for above so we know it's not null
system_vendor=${A_MACHINE_DATA[0]}
added more wifi detection filters
2011-06-09 01:51:46 +00:00
if [[ $B_PORTABLE == 'true' ]];then
changed portable to System
2011-06-08 06:20:43 +00:00
system_vendor="$system_vendor (portable)"
fi
bug fix, added system line
2011-06-08 03:01:49 +00:00
if [[ -n ${A_MACHINE_DATA[1]} ]];then
product_name=${A_MACHINE_DATA[1]}
else
product_name='N/A'
fi
if [[ -n ${A_MACHINE_DATA[2]} ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
product_version=" ${C1}v$SEP3${C2} ${A_MACHINE_DATA[2]}"
bug fix, added system line
2011-06-08 03:01:49 +00:00
fi
if [[ -n ${A_MACHINE_DATA[3]} && $B_OUTPUT_FILTER != 'true' ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
product_serial=" ${C1}serial$SEP3${C2} ${A_MACHINE_DATA[3]} "
bug fix, added system line
2011-06-08 03:01:49 +00:00
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
system_line="${C1}System$SEP3${C2} $system_vendor ${C1}product$SEP3${C2} $product_name$product_version$product_serial"
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
if [[ -n $chassis_line && $( calculate_line_length "$system_line$chassis_line" ) -lt $COLS_INNER ]];then
added some ban list terms, tweaked a few things
2011-06-08 03:48:54 +00:00
system_line="$system_line $chassis_line"
chassis_line=''
fi
fi
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
IFS="$ORIGINAL_IFS"
else
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
system_line="${C2}$sysDmiNull"
user patch, added support, as root user, for dmidecode in -M data. This helps users of older systems get system machine data.
2012-03-26 21:41:53 +00:00
fi
# patch to dump all of above if dmidecode was data source and non root user
fixed for older systems, -M with dmidecode can be empty, so error messages should also show that.
2012-03-26 22:17:27 +00:00
if [[ ${A_MACHINE_DATA[0]} == 'dmidecode-non-root-user' || ${A_MACHINE_DATA[0]} == 'dmidecode-no-smbios-dmi-data' ]];then
if [[ ${A_MACHINE_DATA[0]} == 'dmidecode-non-root-user' ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
system_line="${C2}${sysDmiError}dmidecode: you must be root to run dmidecode"
fixed for older systems, -M with dmidecode can be empty, so error messages should also show that.
2012-03-26 22:17:27 +00:00
elif [[ ${A_MACHINE_DATA[0]} == 'dmidecode-no-smbios-dmi-data' ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
system_line="${C2}${sysDmiError}dmidecode: no machine data available"
fixed for older systems, -M with dmidecode can be empty, so error messages should also show that.
2012-03-26 22:17:27 +00:00
fi
user patch, added support, as root user, for dmidecode in -M data. This helps users of older systems get system machine data.
2012-03-26 21:41:53 +00:00
mobo_line=''
bios_line=''
chassis_line=''
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
system_line=$( create_print_line "Machine:" "$system_line${CN}" )
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
print_screen_output "$system_line"
if [[ -n $mobo_line ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
mobo_line=$( create_print_line " " "$mobo_line${CN}" )
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
print_screen_output "$mobo_line"
fi
if [[ -n $bios_line ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
bios_line=$( create_print_line " " "$bios_line${CN}" )
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
print_screen_output "$bios_line"
fi
if [[ -n $chassis_line ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
chassis_line=$( create_print_line " " "$chassis_line${CN}" )
new options: -m shows machine data, system vendor, if present, mobo, bios, and, with -xx, chassis, if present -xx triggers B_EXTRA_EXTRA_DATA, currently only the chassis data line is affected.
2011-06-08 02:36:00 +00:00
print_screen_output "$chassis_line"
fi
eval $LOGFE
}
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
# args: $1 - module name (could be > 1, so loop it ); $2 - audio (optional)
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
print_module_version()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
local module_versions='' module='' version='' prefix='' modules=$1
# note that sound driver data tends to have upper case, but modules are lower
if [[ $2 == 'audio' ]];then
(Change version) Found another issue, for snd modules, we have to use array item 3, kernel modules loaded, not driver driver for sound modules is a name, not a module name, and also the reported modules need further processing, - to _ and tolower in case.
2010-02-05 23:21:37 +00:00
if [[ -z $( grep -E '^snd' <<< $modules ) ]];then
prefix='snd_' # sound modules start with snd_
fi
New version. Some BSD fixes, and a more important fix, added 'display controller' to graphics card detection, that's a new one on me. Dual card systems might use this. 00:02.0 Display controller: Intel Corporation 82865G Integrated Graphics Controller (rev 02) 01:00.0 VGA compatible controller: NVIDIA Corporation NV44A [GeForce 6200] (rev a1) Some more switches to bash native methods as well.
2014-03-18 02:26:26 +00:00
modules=${modules,,}
modules=${modules//-/_}
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
# special intel processing, generally no version info though
if [[ $modules == 'hda intel' ]];then
modules='hda_intel'
elif [[ $modules == 'intel ich' ]];then
modules='intel8x0'
fi
fi
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
for module in $modules
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
do
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
version=$( get_module_version_number "$prefix$module" )
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
if [[ -n $version ]];then
module_versions="$module_versions $version"
fi
done
if [[ -n $module_versions ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
echo " ${C1}v$SEP3${C2}$module_versions"
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
}
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
print_networking_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
local i='' card_id='' network_data='' a_network_working='' port_data='' driver_data=''
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
local card_string='' port_plural='' module_version='' pci_bus_id='' bus_usb_text=''
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
local bus_usb_id='' line_starter='Network:' card_string='' card_data='' chip_id=''
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
local driver=''
Added trash80 cpu count function, removed redundant multicore lines since all always have same clockspeed etc Major cleanup and refactoring of get gfx functions, cleanup of most print functions, consolidation and removal of unnecessary globals.
2008-10-30 20:32:53 +00:00
# set A_NETWORK_DATA
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
if [[ $BSD_TYPE == 'bsd' ]];then
if [[ $B_PCICONF_SET == 'false' ]];then
get_pciconf_data
fi
get_pciconf_card_data 'network'
else
get_networking_data
fi
Finally figured out how those weird pseud multilevel arrays work, tried it with networking, and it's working, I can get output for each line as an array of an array, so I can print and handle output better now.
2008-11-04 02:14:12 +00:00
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
# will never be null because null is handled in get_network_data, but in case we change
# that leaving this test in place.
Changed all cases of: if [ .....] then or elif [....] then to use the hanging then turd method: if [....];then This will be the standard style for inxi All other flow controls will be on their own lines, ie: do done { }
2008-10-30 17:18:02 +00:00
if [[ -n ${A_NETWORK_DATA[@]} ]];then
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
for (( i=0; i < ${#A_NETWORK_DATA[@]}; i++ ))
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
do
Finally figured out how those weird pseud multilevel arrays work, tried it with networking, and it's working, I can get output for each line as an array of an array, so I can print and handle output better now.
2008-11-04 02:14:12 +00:00
IFS=","
a_network_working=( ${A_NETWORK_DATA[i]} )
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
IFS="$ORIGINAL_IFS"
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
bus_usb_id=''
bus_usb_text=''
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
card_data=''
card_string=''
bug fixes
2011-04-30 06:56:15 +00:00
driver_data=''
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
module_version=''
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
network_data=''
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
pci_bus_id=''
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
port_data=''
port_plural=''
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=''
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
if [[ ${#A_NETWORK_DATA[@]} -gt 1 ]];then
small bug fix, networking cards didn't print out numbered card id
2014-03-17 04:24:42 +00:00
card_id="-$(( $i + 1 ))"
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
fi
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
if [[ -n ${a_network_working[1]} && $B_EXTRA_DATA == 'true' && $BSD_TYPE != 'bsd' ]];then
(Change Version) Found and fixed 2 real bugs: 1 - driver module version print out was broken for both networking and audio, and audio was not at all working due to improperly formatted module names being sent to get module driver version function. 2 - runlevel show was broken, was using a bad path. Fixed, and also made runlevels show now for -F/-xI output Updated top comment header to correctly show true script Depends and true Recommends. Recommends section now also lists which options require which applications, and I updated/corrected the debian package names for each application. Redid the recommended app testing also, now the app is only tested for locally in the get data function when it is requested. Cleaned up some other irregular code methods. Might be one more fix to get it more consistent.
2010-01-29 23:05:11 +00:00
module_version=$( print_module_version "${a_network_working[1]}" )
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
fi
Made all if conditionals use the same syntax, [[.....]];then, since we couldn't get rid of all the [[ stuff without getting errors, it should all be the same, so [[....]] it is. Also cleaned up some other cruft and reorganized code slightly.
2008-11-06 19:43:28 +00:00
if [[ -n ${a_network_working[1]} ]];then
New version, tarball. As always with fixes, one thing creates a bug in another. Fixed linux driver version handling, now only trimming off number from bsd drivers. Some linux drivers, like tg3 for broadcom ethernet, have numbers ending them. So this is a bug fix for 1.8.44 release mainly. Also includes openbsd initial fixes for some issues related to sysctl parsing for cpu and ram.
2013-03-02 17:54:48 +00:00
# note: linux drivers can have numbers, like tg3
if [[ $BSD_TYPE == 'bsd' ]];then
driver=$( sed 's/[0-9]*$//' <<< ${a_network_working[1]} )
else
driver=${a_network_working[1]}
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
driver_data="${C1}driver$SEP3${C2} $driver$module_version "
Finally figured out how those weird pseud multilevel arrays work, tried it with networking, and it's working, I can get output for each line as an array of an array, so I can print and handle output better now.
2008-11-04 02:14:12 +00:00
fi
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
if [[ -n ${a_network_working[2]} && $B_EXTRA_DATA == 'true' ]];then
if [[ $( wc -w <<< ${a_network_working[2]} ) -gt 1 ]];then
port_plural='s'
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
port_data="${C1}port$port_plural$SEP3${C2} ${a_network_working[2]} "
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
fi
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
if [[ -n ${a_network_working[4]} && $B_EXTRA_DATA == 'true' ]];then
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
if [[ -z $( grep '^usb-' <<< ${a_network_working[4]} ) ]];then
and also making busID into bus-ID to make it consistent as well
2011-04-30 23:37:24 +00:00
bus_usb_text='bus-ID'
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
bus_usb_id=${a_network_working[4]}
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
if [[ $BSD_TYPE != 'bsd' ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=$( get_lspci_chip_id "${a_network_working[4]}" )
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
else
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=${a_network_working[10]}
New version, new tarball. This version brings the -A, -G, -N, -n, -i pci data to bsd. Using a pciconf parser to do most of the heavy lifting in this one. Two functions do the main pci card processing for audio, graphics, and networking. All seems to be shipshape and working, tested on freebsd 7.3, 9.0, and 9.1 and the output is consistent.
2013-03-01 05:55:24 +00:00
fi
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
fi
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
else
trying usb-ID instead of USB-ID, looks more consistent
2011-04-30 23:36:38 +00:00
bus_usb_text='usb-ID'
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
bus_usb_id=$( cut -d '-' -f '2-4' <<< ${a_network_working[4]} )
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
chip_id=${a_network_working[10]}
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
fi
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
pci_bus_id="${C1}$bus_usb_text$SEP3${C2} $bus_usb_id"
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ -n $chip_id ]];then
chip_id=" ${C1}chip-ID$SEP3${C2} $chip_id"
first test at adding vendor:product id for -xx
2012-10-19 05:10:56 +00:00
fi
(change version) fixed a bug that made two networking chips of same company when identical create one single doubled driver output. Also added in pcibus id output for -x option with networking and audio cards.
2010-02-05 22:33:07 +00:00
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
card_string="${C1}Card$card_id$SEP3${C2} ${a_network_working[0]} "
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
card_data="$driver_data$port_data$pci_bus_id$chip_id"
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
if [[ $( calculate_line_length "$card_string$card_data" ) -gt $COLS_INNER ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
network_data=$( create_print_line "$line_starter" "$card_string${CN}" )
version update: New internal line character counter implemented, with support for user set line lengths for both irc and console. More line wrapping added, and some fine tuned. Also wraps -A now, and adds alsa information to end of first line as well if > 1 card and less than line length max
2011-06-20 01:16:36 +00:00
line_starter=' '
card_string=''
print_screen_output "$network_data"
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
network_data=$( create_print_line "$line_starter" "$card_string$card_data${CN}" )
Cleaned up some code, moved get usb to separate functions for audio/network card data. Removed legacy print code, repeated code blocks for single/multiple cards, for audio/network. Made also always print out whether or not a card is present, since you can have alsa without having a card. This actually shortened inxi for once, and simplified some legacy methods that were totally unnecessary and just complicated the print functions, now all print functions use the same for loop print out methods on arrays.
2011-06-17 00:20:12 +00:00
line_starter=' '
Tweaked output, fixed bugs, mostly done with major refactoring now
2008-10-29 23:02:24 +00:00
print_screen_output "$network_data"
patch, some optimizations and code cleanup
2011-06-18 18:37:02 +00:00
if [[ $B_SHOW_ADVANCED_NETWORK == 'true' ]];then
print_network_advanced_data
fi
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
done
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
else
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
network_data="${C1}Card$SEP3${C2} Failed to Detect Network Card! "
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
network_data=$( create_print_line "$line_starter" "$network_data${CN}" )
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
print_screen_output "$network_data"
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
fi
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
if [[ $B_SHOW_IP == 'true' ]];then
print_networking_ip_data
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
}
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
print_network_advanced_data()
{
eval $LOGFS
more variable fixes
2011-04-25 06:58:31 +00:00
local network_data='' if_id='N/A' duplex='N/A' mac_id='N/A' speed='N/A' oper_state='N/A'
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
local b_is_wifi='false' speed_string='' duplex_string=''
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
Update Version: New debugging feature: -@ 11 this triggers a download/run of xiin, which reads and writes to file contents of /sys, and also writes to file lsusb, lspci, lspci -vv, and the last 200 lines of /var/log/Xorg.0.log which can be helpful for debugging various gfx driver issues. Might make the last one optional or from another option, we'll see. Also removed for detected wifi cards the speed and duplex modes, since they are not applicable for wifi This will not always work, it detects string wireless, wifi, wi-fi, wlan and if found, doesn't make those lines. Better than meaningless N/A output I'd say. Debugger should make it easier, places data in a directory in $HOME./inxi/ and tells user where to find it.
2011-05-06 21:04:31 +00:00
# first check if it's a known wifi id'ed card, if so, no print of duplex/speed
patch, some optimizations and code cleanup
2011-06-18 18:37:02 +00:00
if [[ -n $( grep -Esi '(wireless|wifi|wi-fi|wlan|802\.11|centrino)' <<< ${a_network_working[0]} ) ]];then
b_is_wifi='true'
fi
if [[ -n ${a_network_working[5]} ]];then
if_id=${a_network_working[5]}
fi
if [[ -n ${a_network_working[6]} ]];then
oper_state=${a_network_working[6]}
fi
# no print out for wifi since it doesn't have duplex/speed data availabe
not showing speed/duplex for lan card when it is down. Because cards don't always have 'up', but might show 'unknown' for state, only not showing if it is down explicitly.
2011-11-22 05:33:11 +00:00
# note that some cards show 'unknown' for state, so only testing explicitly
# for 'down' string in that to skip showing speed/duplex
if [[ $b_is_wifi != 'true' && $oper_state != 'down' ]];then
patch, some optimizations and code cleanup
2011-06-18 18:37:02 +00:00
if [[ -n ${a_network_working[7]} ]];then
# make sure the value is strictly numeric before appending Mbps
if [[ -n $( grep -E '^[0-9\.,]+$' <<< "${a_network_working[7]}" ) ]];then
speed="${a_network_working[7]} Mbps"
added some irc blocked output for security, cleaned up a few glitches in -i and -n functions. Now non irc output is unfiltered, and irc local mac, ip, username output is filtered.
2011-04-25 18:51:46 +00:00
else
patch, some optimizations and code cleanup
2011-06-18 18:37:02 +00:00
speed=${a_network_working[7]}
added some irc blocked output for security, cleaned up a few glitches in -i and -n functions. Now non irc output is unfiltered, and irc local mac, ip, username output is filtered.
2011-04-25 18:51:46 +00:00
fi
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
speed_string="${C1}speed$SEP3${C2} $speed "
patch, some optimizations and code cleanup
2011-06-18 18:37:02 +00:00
if [[ -n ${a_network_working[8]} ]];then
duplex=${a_network_working[8]}
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
duplex_string="${C1}duplex$SEP3${C2} $duplex "
patch, some optimizations and code cleanup
2011-06-18 18:37:02 +00:00
fi
if [[ -n ${a_network_working[9]} ]];then
if [[ $B_OUTPUT_FILTER == 'true' ]];then
mac_id=$FILTER_STRING
else
mac_id=${a_network_working[9]}
fi
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
network_data="${C1}IF$SEP3${C2} $if_id ${C1}state$SEP3${C2} $oper_state $speed_string$duplex_string${C1}mac$SEP3${C2} $mac_id"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
network_data=$( create_print_line " " "$network_data${CN}" )
patch, some optimizations and code cleanup
2011-06-18 18:37:02 +00:00
print_screen_output "$network_data"
new feature, in stable trunk, -n, shows advanced network card information. This will probably be modified quite a bit over time so it's a 1.4.80 to start, once it's stable, it will be 1.5.0 release.
2011-04-25 06:23:41 +00:00
eval $LOGFE
}
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
print_networking_ip_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
local ip=$( get_networking_wan_ip_data )
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
local wan_ip_data='' a_interfaces_working='' interfaces='' i=''
local if_id='' if_ip='' if_ipv6='' if_ipv6_string='' full_string='' if_string=''
local if_id_string='' if_ip_string=''
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
local line_max=$(( $COLS_INNER - 40 ))
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
# set A_INTERFACES_DATA
get_networking_local_ip_data
# first print output for wan ip line. Null is handled in the get function
added some irc blocked output for security, cleaned up a few glitches in -i and -n functions. Now non irc output is unfiltered, and irc local mac, ip, username output is filtered.
2011-04-25 18:51:46 +00:00
if [[ -z $ip ]];then
ip='N/A'
1.5.2: new options: -z, triggers output filtering. This is default on for irc client output. -Z - absolute override, turns off all filtering. This is useful if you are helping someone on irc for example and need to see this data. Fixed a long term bug in the regex that filtered out home name from mount paths in partitions, was greedy, now it just filters out only the name and prints the rest of the full path, as it should. Added twm to desktop support list, that has no --version output so that won't show.
2011-05-24 20:47:22 +00:00
else
if [[ $B_OUTPUT_FILTER == 'true' ]];then
ip=$FILTER_STRING
fi
added some irc blocked output for security, cleaned up a few glitches in -i and -n functions. Now non irc output is unfiltered, and irc local mac, ip, username output is filtered.
2011-04-25 18:51:46 +00:00
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
wan_ip_data="${C1}WAN IP$SEP3${C2} $ip "
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
# then create the list of local interface/ip
i=0 ## loop starts with 1 by auto-increment so it only shows cards > 1
while [[ -n ${A_INTERFACES_DATA[i]} ]]
do
IFS=","
a_interfaces_working=(${A_INTERFACES_DATA[i]})
IFS="$ORIGINAL_IFS"
added some irc blocked output for security, cleaned up a few glitches in -i and -n functions. Now non irc output is unfiltered, and irc local mac, ip, username output is filtered.
2011-04-25 18:51:46 +00:00
if_id='N/A'
if_ip='N/A'
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
if_ipv6='N/A'
if_ipv6_string=''
if [[ -z $( grep '^Interface' <<< ${a_interfaces_working[0]} ) ]];then
if [[ -n ${a_interfaces_working[1]} ]];then
if [[ $B_OUTPUT_FILTER == 'true' ]];then
if_ip=$FILTER_STRING
else
if_ip=${a_interfaces_working[1]}
fi
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
if_ip_string=" ${C1}ip$SEP3${C2} $if_ip"
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
if [[ $B_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_interfaces_working[3]} ]];then
if [[ $B_OUTPUT_FILTER == 'true' ]];then
if_ipv6=$FILTER_STRING
else
if_ipv6=${a_interfaces_working[3]}
fi
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
if_ipv6_string=" ${C1}ip-v6$SEP3${C2} $if_ipv6"
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
fi
added some irc blocked output for security, cleaned up a few glitches in -i and -n functions. Now non irc output is unfiltered, and irc local mac, ip, username output is filtered.
2011-04-25 18:51:46 +00:00
fi
if [[ -n ${a_interfaces_working[0]} ]];then
if_id=${a_interfaces_working[0]}
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
if_string="$wan_ip_data$if_string${C1}IF$SEP3${C2} $if_id$if_ip_string$if_ipv6_string "
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
wan_ip_data=''
if [[ $( calculate_line_length "$if_string" ) -gt $line_max ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
full_string=$( create_print_line " " "$if_string${CN}" )
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
print_screen_output "$full_string"
if_string=''
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
fi
((i++))
done
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
# then print out anything not printed already
if [[ -n $if_string ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
full_string=$( create_print_line " " "$if_string${CN}" )
Improved -i to show IF lan nic IP using as first choice the ip tool from iproute, and to only use the deprecated ifconfig as a fallback. This required recoding that function, so I also made -i show IPv6 with -x as well. Might as well start getting used to it. Also fixed and added wrapping for the -i output, that wasn't working right before, now is standardized to other lines.
2011-06-22 23:26:08 +00:00
print_screen_output "$full_string"
(Big Version Change) This fixes weak spots, bugs, and adds new features. 1. Fixed single core output for -C option, now correctly puts speed on same line 2. Fixed bug with some possible values for network card that makes line color trigger blue: Added space between values. 3. Fixed bug that makes livecds with aufs file system show all partition information 4. Removed -F output of -f to avoid pointless irc spam 5. New option, -i - triggers when used alone -N, networking line, plus Wan IP address of system, and if ifconfig is installed, prints out all interfaces+ip addresses 6. Updated -h menu to reflect these changes. 7. Added 'driver' output for network cards, and fixed driver output for audio cards, so now only uses asound/cards data if single card detected. 8. Moved 'ports' data to -x option, the geek only output that is. This is the next major version release, 0.6.x
2008-11-21 22:32:27 +00:00
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
}
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
print_optical_drive_data()
{
eval $LOGFS
local a_drives='' drive_data='' counter=''
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
local drive_id='' drive_links='' vendor='' speed='' multisession='' mcn='' audio=''
fixed oversight, forgot to put no cd drive detected if all cd / optical drive data is n ull
2011-07-22 07:03:26 +00:00
local dvd='' state='' rw_support='' rev='' separator='' drive_string=''
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
get_optical_drive_data
# 0 - true dev path, ie, sr0, hdc
# 1 - dev links to true path
# 2 - device vendor - for hdx drives, vendor model are one string from proc
# 3 - device model
# 4 - device rev version
if [[ ${#A_OPTICAL_DRIVE_DATA[@]} -gt 0 ]];then
for (( i=0; i < ${#A_OPTICAL_DRIVE_DATA[@]}; i++ ))
do
IFS=","
a_drives=(${A_OPTICAL_DRIVE_DATA[i]})
IFS="$ORIGINAL_IFS"
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
audio=''
drive_data=''
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
drive_id=''
drive_links=''
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
dvd=''
mcn=''
multisession=''
rev=''
rw_support=''
separator=''
speed=''
state=''
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
vendor=''
fixed oversight, forgot to put no cd drive detected if all cd / optical drive data is n ull
2011-07-22 07:03:26 +00:00
if [[ ${#A_OPTICAL_DRIVE_DATA[@]} -eq 1 && -z ${a_drives[0]} && -z ${a_drives[1]} ]];then
tweak
2011-07-22 07:05:02 +00:00
drive_string="No optical drives detected."
bug fix
2011-07-22 07:06:49 +00:00
B_SHOW_FULL_OPTICAL='false'
trying it with /dev/sr0
2011-06-18 04:53:48 +00:00
else
fixed oversight, forgot to put no cd drive detected if all cd / optical drive data is n ull
2011-07-22 07:03:26 +00:00
if [[ ${#A_OPTICAL_DRIVE_DATA[@]} -gt 1 ]];then
counter="-$(( i + 1 ))"
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
fi
fixed oversight, forgot to put no cd drive detected if all cd / optical drive data is n ull
2011-07-22 07:03:26 +00:00
if [[ -z ${a_drives[0]} ]];then
drive_id='N/A'
tweak
2011-06-18 00:46:41 +00:00
else
fixed oversight, forgot to put no cd drive detected if all cd / optical drive data is n ull
2011-07-22 07:03:26 +00:00
drive_id="/dev/${a_drives[0]}"
tweak
2011-06-18 00:46:41 +00:00
fi
fixed oversight, forgot to put no cd drive detected if all cd / optical drive data is n ull
2011-07-22 07:03:26 +00:00
drive_links=$( sed 's/~/,/g' <<< ${a_drives[1]} )
if [[ -z $drive_links ]];then
drive_links='N/A'
fi
if [[ -n ${a_drives[2]} ]];then
vendor=${a_drives[2]}
if [[ -n ${a_drives[3]} ]];then
vendor="$vendor ${a_drives[3]}"
fi
fi
if [[ -z $vendor ]];then
if [[ -n ${a_drives[3]} ]];then
vendor=${a_drives[3]}
else
vendor='N/A'
fi
fi
if [[ $B_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_drives[4]} ]];then
rev=${a_drives[4]}
else
rev='N/A'
fi
rev=" ${C1}rev$SEP3${C2} $rev"
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
fi
fixed oversight, forgot to put no cd drive detected if all cd / optical drive data is n ull
2011-07-22 07:03:26 +00:00
drive_string="$drive_id ${C1}model$SEP3${C2} $vendor$rev ${C1}dev-links$SEP3${C2} $drive_links"
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
drive_data="${C1}Optical${counter}$SEP3${C2} $drive_string"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
drive_data=$( create_print_line "$Line_Starter" "$drive_data${CN}" )
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
print_screen_output "$drive_data"
Line_Starter=' '
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
# 5 - speed
# 6 - multisession support
# 7 - MCN support
# 8 - audio read
# 9 - cdr
# 10 - cdrw
# 11 - dvd read
# 12 - dvdr
# 13 - dvdram
# 14 - state
fixed a bug
2011-06-18 03:49:53 +00:00
if [[ $B_SHOW_FULL_OPTICAL == 'true' ]];then
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
if [[ -z ${a_drives[5]} ]];then
speed='N/A'
else
speed="${a_drives[5]}x"
fi
if [[ -z ${a_drives[8]} ]];then
audio='N/A'
elif [[ ${a_drives[8]} == 1 ]];then
audio='yes'
else
audio='no'
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
audio=" ${C1}audio$SEP3${C2} $audio"
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
if [[ -z ${a_drives[6]} ]];then
multisession='N/A'
elif [[ ${a_drives[6]} == 1 ]];then
multisession='yes'
else
multisession='no'
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
multisession=" ${C1}multisession$SEP3${C2} $multisession"
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
if [[ -z ${a_drives[11]} ]];then
dvd='N/A'
elif [[ ${a_drives[11]} == 1 ]];then
dvd='yes'
else
dvd='no'
fi
arg cleanup
2011-06-18 03:29:49 +00:00
if [[ $B_EXTRA_DATA == 'true' ]];then
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
if [[ -z ${a_drives[14]} ]];then
state='N/A'
else
state="${a_drives[14]}"
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
state=" ${C1}state$SEP3${C2} $state"
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
fi
if [[ -n ${a_drives[9]} && ${a_drives[9]} == 1 ]];then
rw_support='cd-r'
separator=','
fi
if [[ -n ${a_drives[10]} && ${a_drives[10]} == 1 ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
rw_support="$rw_support${separator}cd-rw"
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
separator=','
fi
if [[ -n ${a_drives[12]} && ${a_drives[12]} == 1 ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
rw_support="$rw_support${separator}dvd-r"
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
separator=','
fi
if [[ -n ${a_drives[13]} && ${a_drives[13]} == 1 ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
rw_support="$rw_support${separator}dvd-ram"
more or less done with -d, -dx, and -dxx output
2011-06-18 02:43:59 +00:00
separator=','
fi
if [[ -z $rw_support ]];then
rw_support='none'
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
drive_data="${C1}Features: speed$SEP3${C2} $speed$multisession$audio ${C1}dvd$SEP3${C2} $dvd ${C1}rw$SEP3${C2} $rw_support$state"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
drive_data=$( create_print_line "$Line_Starter" "$drive_data${CN}" )
tweak
2011-06-18 00:46:41 +00:00
print_screen_output "$drive_data"
fi
adding first test for -d optical drive option, patch version update only
2011-06-18 00:27:34 +00:00
done
else
:
fi
eval $LOGFE
}
(Change version) New option -p, outputs all discovered partition information along with the -P stuff. -P was improved to also show /tmp and /usr by default. -p will not show with -F to avoid flooding issues.
2008-12-03 23:14:21 +00:00
print_partition_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
(change version) New feature in swap partition data: show percent used, this is a damentz patch
2009-03-02 00:52:09 +00:00
local a_partition_working='' partition_used='' partition_data=''
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
local counter=0 i=0 a_partition_data='' line_starter='' line_max=$(( $COLS_INNER - 25 ))
output for remote file systems
2009-02-05 01:59:08 +00:00
local partitionIdClean='' part_dev='' full_dev='' part_label='' full_label=''
New version, fixed cpu core speed wrapping, improved -p and -P wrapping, though some lines will still be too long, but not as many.
2014-03-25 01:43:30 +00:00
local part_uuid='' full_uuid='' dev_remote='' full_fs=''
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
local b_non_dev='false' holder=''
(Change version) New option -p, outputs all discovered partition information along with the -P stuff. -P was improved to also show /tmp and /usr by default. -p will not show with -F to avoid flooding issues.
2008-12-03 23:14:21 +00:00
# set A_PARTITION_DATA
get_partition_data
for (( i=0; i < ${#A_PARTITION_DATA[@]}; i++ ))
do
IFS=","
a_partition_working=(${A_PARTITION_DATA[i]})
IFS="$ORIGINAL_IFS"
bug fix
2009-02-11 18:13:22 +00:00
full_label=''
full_uuid=''
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
(change version) New feature in swap partition data: show percent used, this is a damentz patch
2009-03-02 00:52:09 +00:00
if [[ $B_SHOW_PARTITIONS_FULL == 'true' ]] || [[ ${a_partition_working[4]} == 'main' ]];then
(version change) Hopefully close to last cleanup and tweaks before releasing 1.0.0, but we'll see if more features or fixes need to be implemented.
2009-02-05 18:52:17 +00:00
if [[ -n ${a_partition_working[2]} ]];then
added line wraps for very long partition lines
2011-07-22 07:46:20 +00:00
partition_used="${C1}used$SEP3${C2} ${a_partition_working[2]} (${a_partition_working[3]}) "
(Change version) New option -p, outputs all discovered partition information along with the -P stuff. -P was improved to also show /tmp and /usr by default. -p will not show with -F to avoid flooding issues.
2008-12-03 23:14:21 +00:00
else
partition_used='' # reset partition used to null
fi
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
if [[ -n ${a_partition_working[5]} ]];then
full_fs="${a_partition_working[5]}"
else
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
full_fs='N/A' # reset partition fs type
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
fi
added line wraps for very long partition lines
2011-07-22 07:46:20 +00:00
full_fs="${C1}fs$SEP3${C2} $full_fs "
(change version) New feature in swap partition data: show percent used, this is a damentz patch
2009-03-02 00:52:09 +00:00
(version change) Hopefully close to last cleanup and tweaks before releasing 1.0.0, but we'll see if more features or fixes need to be implemented.
2009-02-05 18:52:17 +00:00
if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]];then
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
if [[ -n ${a_partition_working[6]} ]];then
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
if [[ -z $( grep -E '(^//|:/|non-dev)' <<< ${a_partition_working[6]} ) ]];then
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
part_dev="/dev/${a_partition_working[6]}"
output for remote file systems
2009-02-05 01:59:08 +00:00
dev_remote='dev'
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
elif [[ -n $( grep '^non-dev' <<< ${a_partition_working[6]} ) ]];then
holder=$( sed 's/non-dev-//' <<< ${a_partition_working[6]} )
part_dev="$holder"
dev_remote='raid'
output for remote file systems
2009-02-05 01:59:08 +00:00
else
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
part_dev="${a_partition_working[6]}"
output for remote file systems
2009-02-05 01:59:08 +00:00
dev_remote='remote'
fi
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
else
(change version) fixed bug with strange partition data wrapping in df, should now show root again in fringe cases
2009-03-02 01:55:48 +00:00
dev_remote='dev'
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
part_dev='N/A'
fi
added line wraps for very long partition lines
2011-07-22 07:46:20 +00:00
full_dev="${C1}$dev_remote$SEP3${C2} $part_dev "
bug fix
2009-02-11 18:13:22 +00:00
if [[ $B_SHOW_LABELS == 'true' && $dev_remote != 'remote' ]];then
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
if [[ -n ${a_partition_working[7]} ]];then
part_label="${a_partition_working[7]}"
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
else
part_label='N/A'
fi
added line wraps for very long partition lines
2011-07-22 07:46:20 +00:00
full_label="${C1}label$SEP3${C2} $part_label "
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
fi
bug fix
2009-02-11 18:13:22 +00:00
if [[ $B_SHOW_UUIDS == 'true' && $dev_remote != 'remote' ]];then
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
if [[ -n ${a_partition_working[8]} ]];then
part_uuid="${a_partition_working[8]}"
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
else
part_uuid='N/A'
fi
added line wraps for very long partition lines
2011-07-22 07:46:20 +00:00
full_uuid="${C1}uuid$SEP3${C2} $part_uuid"
(change version) Added new function and options, -l -u which trigger partition label and uuid output. Either -u or -l will also automatically trigger the short -P partition flag. To use with full partition output, use: -pul or -pu or -pl This is one of the last major features I wanted to add, and it's because I'm sick of manually checking for uuid or label in /dev/disk.. Ok, have fun.
2009-02-05 01:19:32 +00:00
fi
fi
patch to fix line lengths for / partition data, needs to be a bit shorter.
2011-07-23 03:17:00 +00:00
# don't show user names in output
1.5.2: new options: -z, triggers output filtering. This is default on for irc client output. -Z - absolute override, turns off all filtering. This is useful if you are helping someone on irc for example and need to see this data. Fixed a long term bug in the regex that filtered out home name from mount paths in partitions, was greedy, now it just filters out only the name and prints the rest of the full path, as it should. Added twm to desktop support list, that has no --version output so that won't show.
2011-05-24 20:47:22 +00:00
if [[ $B_OUTPUT_FILTER == 'true' ]];then
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
partitionIdClean=$( sed $SED_RX "s|/home/([^/]+)/(.*)|/home/$FILTER_STRING/\2|" <<< ${a_partition_working[0]} )
added some irc blocked output for security, cleaned up a few glitches in -i and -n functions. Now non irc output is unfiltered, and irc local mac, ip, username output is filtered.
2011-04-25 18:51:46 +00:00
else
partitionIdClean=${a_partition_working[0]}
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
id_size_fs="${C1}ID$SEP3${C2} $partitionIdClean ${C1}size$SEP3${C2} ${a_partition_working[1]} $partition_used$full_fs$full_dev"
added line wraps for very long partition lines
2011-07-22 07:46:20 +00:00
label_uuid="$full_label$full_uuid"
# label/uuid always print one per line, so only wrap if it's very long
New version, fixed cpu core speed wrapping, improved -p and -P wrapping, though some lines will still be too long, but not as many.
2014-03-25 01:43:30 +00:00
if [[ $B_SHOW_UUIDS == 'true' || $B_SHOW_LABELS == 'true' ]] && \
[[ $( calculate_line_length "${a_partition_data[$counter]}$id_size_fs$label_uuid" ) -gt $COLS_INNER ]];then
added line wraps for very long partition lines
2011-07-22 07:46:20 +00:00
a_partition_data[$counter]="$id_size_fs"
((counter++))
a_partition_data[$counter]="$label_uuid"
else
New version, fixed cpu core speed wrapping, improved -p and -P wrapping, though some lines will still be too long, but not as many.
2014-03-25 01:43:30 +00:00
if [[ $( calculate_line_length "${a_partition_data[$counter]}$id_size_fs$label_uuid" ) -gt $COLS_INNER ]];then
a_partition_data[$counter]="${a_partition_data[$counter]}"
((counter++))
a_partition_data[$counter]="$id_size_fs$label_uuid"
else
a_partition_data[$counter]="${a_partition_data[$counter]}$id_size_fs$label_uuid"
fi
refactored partition data output to be fully dynamic, not silly like it was. Also fixed small line length bug where if color scheme 0, no colors is used, the lines would be too long, since the byte count is then less than for irc or shell colors.
2008-12-05 05:21:34 +00:00
fi
New version, fixed cpu core speed wrapping, improved -p and -P wrapping, though some lines will still be too long, but not as many.
2014-03-25 01:43:30 +00:00
((counter++))
# # because these lines can vary widely, using dynamic length handling here
# if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]] || [[ $( calculate_line_length "${a_partition_data[$counter]}" ) -gt $line_max ]];then
# ((counter++))
# fi
(Change version) New option -p, outputs all discovered partition information along with the -P stuff. -P was improved to also show /tmp and /usr by default. -p will not show with -F to avoid flooding issues.
2008-12-03 23:14:21 +00:00
fi
done
refactored partition data output to be fully dynamic, not silly like it was. Also fixed small line length bug where if color scheme 0, no colors is used, the lines would be too long, since the byte count is then less than for irc or shell colors.
2008-12-05 05:21:34 +00:00
# print out all lines, line starter on first line
for (( i=0; i < ${#a_partition_data[@]};i++ ))
do
if [[ $i -eq 0 ]];then
line_starter='Partition:'
else
line_starter=' '
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
partition_data=$( create_print_line "$line_starter" "${a_partition_data[$i]}${CN}" )
refactored partition data output to be fully dynamic, not silly like it was. Also fixed small line length bug where if color scheme 0, no colors is used, the lines would be too long, since the byte count is then less than for irc or shell colors.
2008-12-05 05:21:34 +00:00
print_screen_output "$partition_data"
done
(change version) new feature and option: -o shows unmounted local partitions, with uuid and label if present. Does not show with -F to avoid excessive output
2010-01-09 04:05:21 +00:00
eval $LOGFE
}
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
# legacy not used
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
print_program_version()
{
local patch_version_number=$( get_patch_version_string )
local program_version="${C1}$SCRIPT_NAME$SEP3${C2} $SCRIPT_VERSION_NUMBER$patch_version_number${CN}"
# great trick from: http://ideatrash.net/2011/01/bash-string-padding-with-sed.html
# left pad: sed -e :a -e 's/^.\{1,80\}$/& /;ta'
# right pad: sed -e :a -e 's/^.\{1,80\}$/ &/;ta'
# center pad: sed -e :a -e 's/^.\{1,80\}$/ & /;ta'
New Version, new man. This continues the dyanamic line sizing, I'm doing these one at a time to make it easier to test stuff one by one. Full refactoring/reordering of top global variables, moved user/maintainer set variables to top, and clearly identify all globals. Changed LINE_MAX to COL_MAX but all user configuration files will stay working since inxi now will check for that and translate them to the new variable names. New lines fixed, -C cpu and -f cpu plus full flags. Flags output is now fully dynamic to display screen in terminal/console. Moved cpu short flags to -x because it's not that important in general and just clutters things up in my opinion. Print flags/bogomips on separate line if line greater than display width. The rest of the lines will get a similar treatment, but it takes a bit of trial and error for each line to get it working right. Note that IRC line lengths are NOT dyanamic unless I can find a way to determine the column width of irc clients, but that won't be accurate since fonts vary in widths for each character. CPU was the worst offender in my opinion in terms of regular output wrapping to new line messily, next will be the things with ports/chip id/card id. Tightened up a bit more the dyanamic help / version output handler.
2014-03-14 20:21:10 +00:00
#local line_max=$COLS_INNER
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
#program_version="$( sed -e :a -e "s/^.\{1,$line_max\}$/ &/;ta" <<< $program_version )" # use to create padding if needed
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
# program_version=$( create_print_line "Version:" "$program_version${CN}" )
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
print_screen_output "$program_version"
}
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
print_ps_data()
{
eval $LOGFS
local b_print_first='true'
if [[ $B_SHOW_PS_CPU_DATA == 'true' ]];then
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
get_ps_tcm_data 'cpu'
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
print_ps_item 'cpu' "$b_print_first"
b_print_first='false'
fi
if [[ $B_SHOW_PS_MEM_DATA == 'true' ]];then
New version, new tarball. This update fixes a recent bug report with ancient dmidecode versions, that do not properly support the -s option. Now -M uses only one method for dmidecode, manual construction of the Machine data from the raw dmidecode file. The file output is also parsed a bit to make it more consistently reliable for inxi purposes. This update also includes all recent bsd branch updates, including the new #!/usr/bin/env bash on top which lets inxi run in any environment without changes. Also for bsd, sets sed -i/sed -i '' global value, which means that now all the branches are the same, except the bsd branches will contain the most recent tests and bsd handling. As each step is reached, I'll release a new inxi that should be stable, this is the first one however that can be used as is, no changes, for bsd, debian kfreebsd, and linux systems. Pleasen note that most bsd features are either incomplete or missing completely at this point, but it's a start. Some initial changes as well to help options to show more correct linux or bsd terms. These will be updated as time permits, it is a long process.
2013-02-12 05:01:07 +00:00
get_ps_tcm_data 'mem'
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
print_ps_item 'mem' "$b_print_first"
fi
eval $LOGFE
}
# args: $1 - cpu/mem; $2 true/false
print_ps_item()
{
eval $LOGFS
local a_ps_data='' ps_data='' line_starter='' line_start_data='' full_line=''
fine tuned output, changed app: to either command: or daemon: , app isn't very accurate since it can be many things.
2010-02-16 23:02:01 +00:00
local app_name='' app_pid='' app_cpu='' app_mem='' throttled='' app_daemon=''
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
local b_print_first=$2 line_counter=0 i=0 count_nu='' extra_data=''
(change version) cleaned ps functions up a bit, made args more clean. Added in output to let users know why their irc request for > 5 lines is 5, throttled from x.
2010-02-14 17:15:44 +00:00
if [[ -n $PS_THROTTLED ]];then
throttled=" ${C1} - throttled from${C2} $PS_THROTTLED"
fi
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
case $1 in
cpu)
(change version) cleaned ps functions up a bit, made args more clean. Added in output to let users know why their irc request for > 5 lines is 5, throttled from x.
2010-02-14 17:15:44 +00:00
line_start_data="${C1}CPU - % used - top ${C2} $PS_COUNT ${C1}active$throttled "
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
;;
mem)
(change version) cleaned ps functions up a bit, made args more clean. Added in output to let users know why their irc request for > 5 lines is 5, throttled from x.
2010-02-14 17:15:44 +00:00
line_start_data="${C1}Memory - MB / % used - top ${C2} $PS_COUNT ${C1}active$throttled"
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
;;
esac
if [[ $b_print_first == 'true' ]];then
line_starter='Processes:'
else
line_starter=' '
fi
(change version) cleaned ps functions up a bit, made args more clean. Added in output to let users know why their irc request for > 5 lines is 5, throttled from x.
2010-02-14 17:15:44 +00:00
# appName, appPath, appStarterName, appStarterPath, cpu, mem, pid, vsz, user
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
ps_data=$( create_print_line "$line_starter" "$line_start_data${CN}" )
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
print_screen_output "$ps_data"
for (( i=0; i < ${#A_PS_DATA[@]}; i++ ))
do
IFS=","
a_ps_data=(${A_PS_DATA[i]})
IFS="$ORIGINAL_IFS"
fine tuned output, changed app: to either command: or daemon: , app isn't very accurate since it can be many things.
2010-02-16 23:02:01 +00:00
# handle the converted app names, with ~..~ means it didn't have a path
if [[ -n $( grep -E '^~.*~$' <<< ${a_ps_data[0]} ) ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
app_daemon='daemon'
fine tuned output, changed app: to either command: or daemon: , app isn't very accurate since it can be many things.
2010-02-16 23:02:01 +00:00
else
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
app_daemon='command'
fine tuned output, changed app: to either command: or daemon: , app isn't very accurate since it can be many things.
2010-02-16 23:02:01 +00:00
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
app_name=" ${C1}$app_daemon$SEP3${C2} ${a_ps_data[0]}"
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
if [[ ${a_ps_data[0]} != ${a_ps_data[2]} ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
app_name="$app_name ${C1}(started by$SEP3${C2} ${a_ps_data[2]}${C1})${C2}"
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
app_pid=" ${C1}pid$SEP3${C2} ${a_ps_data[6]}"
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
# ${C1}user$SEP3${C2} ${a_ps_data[8]}
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
case $1 in
cpu)
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
app_cpu=" ${C1}cpu$SEP3${C2} ${a_ps_data[4]}%"
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
if [[ $B_EXTRA_DATA == 'true' ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
extra_data=" ${C1}mem$SEP3${C2} ${a_ps_data[7]}MB (${a_ps_data[5]}%)${C2}"
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
fi
;;
mem)
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
app_mem=" ${C1}mem$SEP3${C2} ${a_ps_data[7]}MB (${a_ps_data[5]}%)${C2}"
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
if [[ $B_EXTRA_DATA == 'true' ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
extra_data=" ${C1}cpu$SEP3${C2} ${a_ps_data[4]}%"
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
fi
;;
esac
(( line_counter++ ))
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
count_nu="${C1}$line_counter$SEP3${C2}"
cleaned up some variable misnamings
2010-02-13 06:10:31 +00:00
full_line="$count_nu$app_cpu$app_mem$app_name$app_pid$extra_data"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
ps_data=$( create_print_line " " "$full_line${CN}" )
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
print_screen_output "$ps_data"
done
eval $LOGFE
}
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
print_raid_data()
{
eval $LOGFS
local device='' device_string='' device_state='' raid_level='' device_components=''
local device_report='' u_data='' blocks='' super_blocks='' algorithm='' chunk_size=''
local bitmap_values='' recovery_progress_bar='' recovery_percent='' recovered_sectors=''
local finish_time='' recovery_speed='' raid_counter=0 device_counter=1 basic_counter=1
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
local a_raid_working='' raid_data='' kernel_support='' read_ahead='' unused_devices=''
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
local basic_raid='' basic_raid_separator='' basic_raid_plural='' inactive=''
added a protection against no /proc/mdstat might be needed on old systems, we'll see.
2012-05-11 06:21:32 +00:00
local component_separator='' device_id='' print_string='' loop_limit=0 array_count_unused=''
removed RAID line from -b output if either no /proc/mdstat file or if no raid devices detected. -b should always be as short and non verbose as possible. Also noted in --help that -b does not show hard drive names, just totals.
2012-05-11 17:30:17 +00:00
local array_count='' raid_event='' b_print_lines='true'
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
local no_raid_detected='' dev_string='/dev/'
local empty_raid_data='' report_size='report' blocks_avail='blocks' chunk_raid_usage='chunk size'
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
if [[ -n $BSD_TYPE ]];then
adding debugger data directory
2014-03-25 20:07:13 +00:00
no_raid_detected='No zfs software RAID detected-other types not yet supported.'
empty_raid_data='No zfs RAID data available-other types not yet supported.'
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
report_size='full size'
blocks_avail='available size'
chunk_raid_usage='raid allocated'
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
else
adding debugger data directory
2014-03-25 20:07:13 +00:00
no_raid_detected="No RAID data: $FILE_MDSTAT missing-is md_mod kernel module loaded?"
empty_raid_data="No RAID devices: $FILE_MDSTAT, md_mod kernel module present"
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ $BSD_TYPE == 'bsd' ]];then
dev_string=''
fi
New version, updated man page. A bug fix for an old time bug: with mdraid, -o (unmounted partitions) would show components of the md raid array as unmounted partitions. This is of course incorrect, and is now fixed. Small update of man page as well to note that -o will not show components of mdraid arrays.
2013-02-28 06:12:04 +00:00
if [[ $B_RAID_SET != 'true' ]];then
get_raid_data
fi
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
for (( i=0; i < ${#A_RAID_DATA[@]}; i++ ))
do
IFS=","
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
a_raid_working=(${A_RAID_DATA[i]})
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
IFS="$ORIGINAL_IFS"
# reset on each iteration
algorithm=''
bitmap_values=''
blocks=''
component_separator=''
device=''
device_components=''
device_id=''
device_report=''
device_state=''
failed=''
finish_time=''
inactive=''
raid_event=''
raid_level=''
recovery_percent=''
recovery_progress_bar=''
recovered_sectors=''
recovery_speed=''
spare=''
super_blocks=''
u_data=''
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ -n $( grep '^md' <<< ${a_raid_working[0]} ) && -z $BSD_TYPE ]] || \
[[ -n $BSD_TYPE && ${a_raid_working[0]} != '' ]];then
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
if [[ $B_SHOW_BASIC_RAID == 'true' ]];then
if [[ $basic_raid != '' ]];then
basic_raid_plural='s'
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[1]} == 'inactive' ]];then
inactive=" - ${a_raid_working[1]}"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
basic_raid="$basic_raid$basic_raid_separator${C1}$basic_counter$SEP3${C2} $dev_string${a_raid_working[0]}$inactive"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
basic_raid_separator=' '
(( basic_counter++ ))
else
device_id="-$device_counter"
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
device="$dev_string${a_raid_working[0]}"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
(( device_counter++ ))
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[1]} != '' ]];then
device_state=" - ${a_raid_working[1]}"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[2]} == '' ]];then
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
raid_level='N/A'
else
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
raid_level=${a_raid_working[2]}
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
# there's one case: md0 : inactive that has to be protected against
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[2]} == '' && ${a_raid_working[1]} == 'inactive' ]];then
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
raid_level=''
else
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
raid_level=" ${C1}raid$SEP3${C2} $raid_level"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[4]} != '' ]];then
device_report="${a_raid_working[4]}"
fixed small issue, turns out sometimes for raid devices, the [2/2] [UU] type data is simply not present. That is now handled explicitly, version 1.8.2
2012-05-11 18:46:54 +00:00
else
device_report="N/A"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
if [[ $B_EXTRA_DATA == 'true' ]];then
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[6]} != '' ]];then
blocks=${a_raid_working[6]}
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
else
blocks='N/A'
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
blocks=" ${C1}$blocks_avail$SEP3${C2} $blocks"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[9]} != '' ]];then
chunk_size=${a_raid_working[9]}
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
else
chunk_size='N/A'
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
chunk_size=" ${C1}$chunk_raid_usage$SEP3${C2} $chunk_size"
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[10]} != '' ]];then
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
bitmap_value='true'
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
bitmap_value=" ${C1}bitmap$SEP3${C2} $bitmap_value"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
fi
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[5]} != '' ]];then
u_data=" ${a_raid_working[5]}"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[7]} != '' ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
super_blocks=" ${C1}super blocks$SEP3${C2} ${a_raid_working[7]}"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[8]} != '' ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
algorithm=" ${C1}algorithm$SEP3${C2} ${a_raid_working[8]}"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[3]} == '' ]];then
if [[ ${a_raid_working[1]} != 'inactive' ]];then
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
device_components='N/A'
fi
else
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
for component in ${a_raid_working[3]}
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
do
if [[ $B_EXTRA_DATA != 'true' ]];then
component=$( sed 's/\[[0-9]\+\]//' <<< $component )
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
# NOTE: for bsd zfs, states are: ONLINE,DEGRADED,OFFLINE (at least)
New version, bug fix for mdraid, and cleaned up some errors and weak spots in component output for mdraid. Certain conditions would trigger a false return for raid components, now it shows more explicitly the online/spare/failed data so it's clear. Also shows 'none' for online if none are detected.
2013-02-27 22:02:44 +00:00
if [[ -n $( grep -E '(F|DEGRADED)' <<< $component ) ]];then
bug fix
2013-02-27 21:16:20 +00:00
component=$( sed -e 's/(F)//' -e 's/F//' -e 's/DEGRADED//' <<< $component )
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
failed="$failed $component"
component=''
New version, bug fix for mdraid, and cleaned up some errors and weak spots in component output for mdraid. Certain conditions would trigger a false return for raid components, now it shows more explicitly the online/spare/failed data so it's clear. Also shows 'none' for online if none are detected.
2013-02-27 22:02:44 +00:00
elif [[ -n $( grep -E '(S|OFFLINE)' <<< $component ) ]];then
bug fix
2013-02-27 21:16:20 +00:00
component=$( sed -e 's/(S)//' -e 's/S//' -e 's/OFFLINE//' <<< $component )
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
spare="$spare $component"
component=''
else
New version, bug fix for mdraid, and cleaned up some errors and weak spots in component output for mdraid. Certain conditions would trigger a false return for raid components, now it shows more explicitly the online/spare/failed data so it's clear. Also shows 'none' for online if none are detected.
2013-02-27 22:02:44 +00:00
device_components="$device_components$component_separator$component"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
component_separator=' '
fi
done
if [[ $failed != '' ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
failed=" ${C1}FAILED$SEP3${C2}$failed${C2}"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
if [[ $spare != '' ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
spare=" ${C1}spare$SEP3${C2}$spare${C2}"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version, bug fix for mdraid, and cleaned up some errors and weak spots in component output for mdraid. Certain conditions would trigger a false return for raid components, now it shows more explicitly the online/spare/failed data so it's clear. Also shows 'none' for online if none are detected.
2013-02-27 22:02:44 +00:00
if [[ -n $device_components || -n $spare || -n $failed ]];then
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ $B_EXTRA_DATA != 'true' && -z $BSD_TYPE ]];then
New version, bug fix for mdraid, and cleaned up some errors and weak spots in component output for mdraid. Certain conditions would trigger a false return for raid components, now it shows more explicitly the online/spare/failed data so it's clear. Also shows 'none' for online if none are detected.
2013-02-27 22:02:44 +00:00
if [[ $device_report != 'N/A' && -n $device_components ]];then
fixed small issue, turns out sometimes for raid devices, the [2/2] [UU] type data is simply not present. That is now handled explicitly, version 1.8.2
2012-05-11 18:46:54 +00:00
device_components="$device_report - $device_components"
fi
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version, bug fix for mdraid, and cleaned up some errors and weak spots in component output for mdraid. Certain conditions would trigger a false return for raid components, now it shows more explicitly the online/spare/failed data so it's clear. Also shows 'none' for online if none are detected.
2013-02-27 22:02:44 +00:00
if [[ $device_components == '' ]];then
device_components='none'
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
device_components="${C1}online$SEP3${C2} $device_components"
device_components=" ${C1}components$SEP3${C2} $device_components$failed$spare"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_raid_data[$raid_counter]="${C1}Device$device_id$SEP3${C2} $device$device_state$raid_level$device_components"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ $B_EXTRA_DATA == 'true' && ${a_raid_working[1]} != 'inactive' ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_raid_data[$raid_counter]="${C1}Device$device_id$SEP3${C2} $device$device_state$device_components"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
(( raid_counter++ ))
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_string="${C1}Info$SEP3${C2}$raid_level ${C1}$report_size$SEP3${C2} $device_report$u_data"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
print_string="$print_string$blocks$chunk_size$bitmap_value$super_blocks$algorithm"
a_raid_data[$raid_counter]="$print_string"
else
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_raid_data[$raid_counter]="${C1}Device$device_id$SEP3${C2} $device$device_state$raid_level$device_components"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
(( raid_counter++ ))
# now let's do the recover line if required
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[12]} != '' ]];then
recovery_percent=$( cut -d '~' -f 2 <<< ${a_raid_working[12]} )
if [[ ${a_raid_working[14]} != '' ]];then
finish_time=${a_raid_working[14]}
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
else
finish_time='N/A'
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
finish_time=" ${C1}time remaining$SEP3${C2} $finish_time"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
if [[ $B_EXTRA_DATA == 'true' ]];then
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[13]} != '' ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
recovered_sectors=" ${C1}sectors$SEP3${C2} ${a_raid_working[13]}"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
fi
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[11]} != '' ]];then
recovery_progress_bar=" ${a_raid_working[11]}"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
if [[ ${a_raid_working[15]} != '' ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
recovery_speed=" ${C1}speed$SEP3${C2} ${a_raid_working[15]}"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_raid_data[$raid_counter]="${C1}Recovering$SEP3${C2} $recovery_percent$recovery_progress_bar$recovered_sectors$finish_time$recovery_speed"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
(( raid_counter++ ))
fi
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
elif [[ ${a_raid_working[0]} == 'KernelRaidSupport' ]];then
if [[ ${a_raid_working[1]} == '' ]];then
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
kernel_support='N/A'
else
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
kernel_support=${a_raid_working[1]}
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
kernel_support=" ${C1}supported$SEP3${C2} $kernel_support"
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
elif [[ ${a_raid_working[0]} == 'ReadAhead' ]];then
if [[ ${a_raid_working[1]} != '' ]];then
read_ahead=${a_raid_working[1]}
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
read_ahead=" ${C1}read ahead$SEP3${C2} $read_ahead"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
elif [[ ${a_raid_working[0]} == 'UnusedDevices' ]];then
if [[ ${a_raid_working[1]} == '' ]];then
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
unused_devices='N/A'
else
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
unused_devices=${a_raid_working[1]}
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
unused_devices="${C1}Unused Devices$SEP3${C2} $unused_devices"
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
elif [[ ${a_raid_working[0]} == 'raidEvent' ]];then
if [[ ${a_raid_working[1]} != '' ]];then
raid_event=${a_raid_working[1]}
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
raid_event=" ${C1}Raid Event$SEP3${C2} ${a_raid_working[1]}"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
fi
done
if [[ $B_SHOW_BASIC_RAID == 'true' && $basic_raid != '' ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_raid_data[0]="${C1}Device$basic_raid_plural$SEP3${C2} $basic_raid"
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
# note bsd temp test hack to make it run
if [[ $B_MDSTAT_FILE != 'true' && -z $BSD_TYPE ]] || \
[[ -n $BSD_TYPE && $B_BSD_RAID == 'false' ]];then
By suggestion and good sense, -R has been modified. New tarball as well. Now RAID works like this: -b - if no /proc/mdstat, or if no devices found and module is running, show nothing, otherwise show short form as before -F - if no proc/mdstat, show nothing, if no devices but mdstat and if -xx, show all lines, otherwise show normal -R - show all messages and missing file/module information so users, particularly sys admins, know right away module is running even if no devices. -v 6 and less, like -F. -v 7, like -R run, ie, show all messages. this gets rid of unneeded line output given that only if you have md_mod running will you have any data for /proc/mdstat and that module is only running if you have mdraid installed. Also redid the no data messages for no module state and no devices state to better reflect what is actually happening. Good adjustment and good cleanup of unneeded output while tightening the actual usability of the specific messages received.
2012-05-15 01:51:58 +00:00
if [[ $B_SHOW_RAID_R == 'true' ]];then
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
a_raid_data[0]="$no_raid_detected"
removed RAID line from -b output if either no /proc/mdstat file or if no raid devices detected. -b should always be as short and non verbose as possible. Also noted in --help that -b does not show hard drive names, just totals.
2012-05-11 17:30:17 +00:00
else
b_print_lines='false'
fi
adjusted the missing mdstat file method to be right.
2012-05-11 06:23:52 +00:00
else
if [[ ${a_raid_data[0]} == '' ]];then
removed RAID line from -b output if either no /proc/mdstat file or if no raid devices detected. -b should always be as short and non verbose as possible. Also noted in --help that -b does not show hard drive names, just totals.
2012-05-11 17:30:17 +00:00
if [[ $B_SHOW_BASIC_RAID != 'true' ]];then
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
a_raid_data[0]="$empty_raid_data"
removed RAID line from -b output if either no /proc/mdstat file or if no raid devices detected. -b should always be as short and non verbose as possible. Also noted in --help that -b does not show hard drive names, just totals.
2012-05-11 17:30:17 +00:00
else
b_print_lines='false'
fi
adjusted the missing mdstat file method to be right.
2012-05-11 06:23:52 +00:00
fi
# now let's add on the system line and the unused device line. Only print on -xx
if [[ $kernel_support$read_ahead$raid_event != '' ]];then
array_count=${#a_raid_data[@]}
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
a_raid_data[array_count]="${C1}System$SEP3${C2}$kernel_support$read_ahead$raid_event"
adjusted the missing mdstat file method to be right.
2012-05-11 06:23:52 +00:00
loop_limit=1
fi
if [[ $unused_devices != '' ]];then
array_count_unused=${#a_raid_data[@]}
a_raid_data[array_count_unused]="$unused_devices"
loop_limit=2
added a protection against no /proc/mdstat might be needed on old systems, we'll see.
2012-05-11 06:21:32 +00:00
fi
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
New version, updated man page. Completed zfs raid support for bsds, now include component status as with mdraid, will show offline/failed devices as well in standard output. Updated help and man page to reflect the difference between -R, -Rx, and -Rxx output for zfs / mdraid. No linux inxi changes, this should not alter any behaviors in -R for mdraid, if it does, it's a bug, please report it.
2013-02-27 20:45:26 +00:00
removed RAID line from -b output if either no /proc/mdstat file or if no raid devices detected. -b should always be as short and non verbose as possible. Also noted in --help that -b does not show hard drive names, just totals.
2012-05-11 17:30:17 +00:00
# we don't want to print anything if it's -b and no data is present, just a waste of a line
if [[ $b_print_lines == 'true' ]];then
# print out all lines, line starter on first line
for (( i=0; i < ${#a_raid_data[@]} - $loop_limit;i++ ))
do
if [[ $i -eq 0 ]];then
line_starter='RAID:'
else
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
line_starter=' '
fi
removed RAID line from -b output if either no /proc/mdstat file or if no raid devices detected. -b should always be as short and non verbose as possible. Also noted in --help that -b does not show hard drive names, just totals.
2012-05-11 17:30:17 +00:00
if [[ $B_EXTRA_EXTRA_DATA == 'true' && $array_count != '' ]];then
if [[ $i == 0 ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
raid_data=$( create_print_line "$line_starter" "${a_raid_data[array_count]}${CN}" )
removed RAID line from -b output if either no /proc/mdstat file or if no raid devices detected. -b should always be as short and non verbose as possible. Also noted in --help that -b does not show hard drive names, just totals.
2012-05-11 17:30:17 +00:00
print_screen_output "$raid_data"
line_starter=' '
fi
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
fi
removed RAID line from -b output if either no /proc/mdstat file or if no raid devices detected. -b should always be as short and non verbose as possible. Also noted in --help that -b does not show hard drive names, just totals.
2012-05-11 17:30:17 +00:00
raid_data=$( create_print_line "$line_starter" "${a_raid_data[i]}" )
print_screen_output "$raid_data"
if [[ $B_EXTRA_EXTRA_DATA == 'true' && $array_count_unused != '' ]];then
if [[ $i == $(( array_count_unused - 2 )) ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
raid_data=$( create_print_line "$line_starter" "${a_raid_data[array_count_unused]}${CN}" )
removed RAID line from -b output if either no /proc/mdstat file or if no raid devices detected. -b should always be as short and non verbose as possible. Also noted in --help that -b does not show hard drive names, just totals.
2012-05-11 17:30:17 +00:00
print_screen_output "$raid_data"
fi
fi
done
fi
New feature, updated to inxi 1.8.0, -R for RAID output. Includes 4 levels, -b shows basic only, -R shows primary info, device id, components, state, and report on drives -Rx shows more, and triggers a second info line per device with more raid info. -Rxx also adds more information, and triggers system raid support info and unmounted raid devices line. -F uses -R now. And that's that, enough raid stuff for a lifetime.
2012-05-11 06:01:17 +00:00
eval $LOGFE
}
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
# currently only apt using distros support this feature, but over time we can add others
print_repo_data()
{
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
eval $LOGFS
code cleanup
2009-10-12 22:44:01 +00:00
local repo_count=0 repo_line='' file_name='' file_content='' file_name_holder=''
new tarball, new version. This fixes a somewhat obscure issue where for example rpmforge adds apt repos, and also I assume some apt rpm tools might do the same for yum repos. Now inxi will simply note the presence of each type, for apt and yum. I didnt' do this feature for pacman and pisi, because I've never heard of that, but if necessary, I'll add it. Now inxi will hopefully correctly note the presence of the various repos and list the files with the repo type correctly noted for each type. I also fixed a bug in the yum/rpm type repo detection, inxi failed to properly handle spaces around the = sign, which made it falsely identify as enabled disabled repos, it tested for only ^enabled=1 whereas also ^enabled = 1 is a possible syntax. This is now corrected.
2012-12-22 04:01:02 +00:00
local repo_full='' b_print_next_line='false' repo_type=''
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
get_repo_data
if [[ -n $REPO_DATA ]];then
# loop through the variable's lines one by one, update counter each iteration
while read repo_line
do
(( repo_count++ ))
new tarball, new version. This fixes a somewhat obscure issue where for example rpmforge adds apt repos, and also I assume some apt rpm tools might do the same for yum repos. Now inxi will simply note the presence of each type, for apt and yum. I didnt' do this feature for pacman and pisi, because I've never heard of that, but if necessary, I'll add it. Now inxi will hopefully correctly note the presence of the various repos and list the files with the repo type correctly noted for each type. I also fixed a bug in the yum/rpm type repo detection, inxi failed to properly handle spaces around the = sign, which made it falsely identify as enabled disabled repos, it tested for only ^enabled=1 whereas also ^enabled = 1 is a possible syntax. This is now corrected.
2012-12-22 04:01:02 +00:00
repo_type=$( cut -d ':' -f 1 <<< $repo_line )
file_name=$( cut -d ':' -f 2 <<< $repo_line )
file_content=$( cut -d ':' -f 3-7 <<< $repo_line )
(change version) adding in a spacer in :// to turn off auto show page title in irc clients. For terminal, will not add space. This fixes an irc client bot showing title of web pages of any url, like amybot
2009-10-13 02:50:09 +00:00
# this will dump unwanted white space line starters. Some irc channels
# use bots that show page title for urls, so need to break the url by adding
# a white space.
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'true' ]];then
(change version) adding in a spacer in :// to turn off auto show page title in irc clients. For terminal, will not add space. This fixes an irc client bot showing title of web pages of any url, like amybot
2009-10-13 02:50:09 +00:00
file_content=$( echo $file_content | sed 's|://|: //|' )
else
file_content=$( echo $file_content )
fi
New version, tarball. Added urpmq for -r. Other distros than Mandriva, Mageia, no other changes so no need to update unless you want to. This adds support for Mandriva, Mageia. urpmq parsing is similar but not identical to pisi.
2013-10-05 01:40:00 +00:00
# echo $file_name : $file_name_holder : $repo_type : $file_content
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
# check file name, if different, update the holder for print out
if [[ $file_name != $file_name_holder ]];then
New version, tarball. Added urpmq for -r. Other distros than Mandriva, Mageia, no other changes so no need to update unless you want to. This adds support for Mandriva, Mageia. urpmq parsing is similar but not identical to pisi.
2013-10-05 01:40:00 +00:00
if [[ $repo_type == 'pisi repo' || $repo_type == 'urpmq repo' ]];then
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
repo_full="${C1}$repo_type$SEP3${C2} $file_name"
New version, tarball. Added urpmq for -r. Other distros than Mandriva, Mageia, no other changes so no need to update unless you want to. This adds support for Mandriva, Mageia. urpmq parsing is similar but not identical to pisi.
2013-10-05 01:40:00 +00:00
else
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
repo_full="${C1}Active $repo_type in file$SEP3${C2} $file_name"
after getting user data, added pardus pisi repo listing support for the -r repo list option. This method will probably work for arch too I'd guess if pacman lists repos in the same way
2010-02-01 02:52:30 +00:00
fi
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
file_name_holder=$file_name
bug fix, forgot to print file name contents on that iteration
2009-10-12 22:51:04 +00:00
b_print_next_line='true'
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
else
cleanup of code
2009-10-12 23:05:26 +00:00
repo_full=$file_content
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
fi
# first line print Repos:
if [[ $repo_count -eq 1 ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
repo_full=$( create_print_line "Repos:" "$repo_full${CN}" )
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
else
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
repo_full=$( create_print_line " " "$repo_full${CN}" )
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
fi
print_screen_output "$repo_full"
bug fix, forgot to print file name contents on that iteration
2009-10-12 22:51:04 +00:00
# this prints the content of the file as well as the file name
if [[ $b_print_next_line == 'true' ]];then
cleanup of code
2009-10-12 23:05:26 +00:00
repo_full=$( create_print_line " " "$file_content" )
bug fix, forgot to print file name contents on that iteration
2009-10-12 22:51:04 +00:00
print_screen_output "$repo_full"
code cleanup
2009-10-12 22:56:15 +00:00
b_print_next_line='false'
bug fix, forgot to print file name contents on that iteration
2009-10-12 22:51:04 +00:00
fi
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
done <<< "$REPO_DATA"
else
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
repo_full=$( create_print_line "Repos:" "${C1}Error$SEP3${C2} $SCRIPT_NAME does not support this feature for your distro yet." )
code cleanup
2009-10-12 22:44:01 +00:00
print_screen_output "$repo_full"
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
fi
(change version) New option: -t requires extra args c, m, or cm (cpu, memory, or both). Accepts further additional option: 1-20 This will show top cpu processes for default number or user selection, and top memory using processes. Sample: inxi -t c7
2010-02-13 01:21:29 +00:00
eval $LOGFE
(change version) by request, added option to output contents of sources file(s). Reads all sources (currently only for apt systems like debian/ubuntu and derived), then prints out file name, and the file active repos. Does not print out inactive, commented out, or blank lines.
2009-10-12 22:28:10 +00:00
}
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
print_sensors_data()
{
eval $LOGFS
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
local mobo_temp='' cpu_temp='' psu_temp='' cpu_fan='' mobo_fan='' ps_fan='' sys_fans='' sys_fans2=''
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
local temp_data='' fan_data='' fan_data2='' b_is_error='false' fan_count=0 gpu_temp=''
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
local a_sensors_working=''
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
local no_sensors_message='None detected - is lm-sensors installed and configured?'
adding support, initial, for free xorg gpu temp output, first only for the newer radeons
2011-06-24 21:59:57 +00:00
local Sensors_Data="$( get_sensors_output )"
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
get_sensors_data
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
if [[ $BSD_TYPE == 'bsd' ]];then
no_sensors_message='This feature is not yet supported for BSD systems.'
fi
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
IFS=","
a_sensors_working=( ${A_SENSORS_DATA[0]} )
IFS="$ORIGINAL_IFS"
more comments tweaks and clarifications
2009-07-30 01:09:58 +00:00
# initial error cases, for missing app or unconfigured sensors. Note that array 0
moved man pages to trunk, easier that way
2012-05-16 01:30:00 +00:00
# always has at least 3 items, cpu/mobo/psu temp in it. If the count is 0, then
# no sensors are installed/configured
if [[ ${#a_sensors_working[@]} -eq 0 ]];then
New version, updated man page, new tarball. Fixed partition bug that could falsely identify a remote filesystem like nfs as /dev fs Added two options: -! 31 - Turns off Host section of System line. This is useful if you want to post output from server without posting its name. -! 32 - Turns on Host section if it has been disabled by user configuration file B_SHOW_HOST='false' Added missing CPU data message, fixed missing cpu cache/bogomips output, turned off bogomips if null for bsd systems because bogomips is a linux kernel feature. Added N/A for no memory report, this would mainly hit bsd systems where user has no permissions to use sysctl or has no read rights for /var/run/dmesg.boot. Many fixes for partitions, now for bsd, if available, uses gpart list to get uuid/label Added support for raid file system syntax in bsd, now excludes main raid device name, and adds a flag to raiddevice/partitionname type so output can identify it as a raid slice/partition. In man page, added -! 31 / -! 32 sections, and some other small edits. Added bsd raid line error message, added bsd sensors line error message. Many other small bug fixes that should make linux more robust in terms of missing data, and better/cleaner output for bsd.
2013-02-18 20:33:05 +00:00
cpu_temp=$no_sensors_message
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
b_is_error='true'
else
for (( i=0; i < ${#A_SENSORS_DATA[@]}; i++ ))
do
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
IFS=","
a_sensors_working=( ${A_SENSORS_DATA[i]} )
IFS="$ORIGINAL_IFS"
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
case $i in
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
# first the temp data
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
0)
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
if [[ -n ${a_sensors_working[0]} ]];then
cpu_temp=${a_sensors_working[0]}
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
else
cpu_temp='N/A'
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
cpu_temp="${C1}System Temperatures: cpu$SEP3${C2} $cpu_temp "
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
if [[ -n ${a_sensors_working[1]} ]];then
mobo_temp=${a_sensors_working[1]}
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
else
mobo_temp='N/A'
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
mobo_temp="${C1}mobo$SEP3${C2} $mobo_temp "
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
if [[ -n ${a_sensors_working[2]} ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
psu_temp="${C1}psu$SEP3${C2} ${a_sensors_working[2]} "
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
fi
bug fix, forgot to remove a timer. This won't be seen by users though unless they are running the debugger.
2011-06-23 00:34:40 +00:00
gpu_temp=$( get_gpu_temp_data )
(change version nu) Added nvidia only gpu temp output for multiple gpus. If > 1 gpu screen is detected, it will output the gpu temp data for each discovered screen. For 1 gpu with nvidia, it will show screen nu if you use the -x option, or with -F This is an nvidia proprietary driver feature only.
2009-11-16 19:03:29 +00:00
# dump the unneeded screen data for single gpu systems
if [[ $( wc -w <<< $gpu_temp ) -eq 1 && $B_EXTRA_DATA != 'true' ]];then
changed to use bash variable stuff instead of subshell, no functional change, but the bash variable manipulation seems to be a bit, quite a bit in some cases, more efficient than subshells, so I'll remove as many subshells as makes sense over time. Only dumping the wc -c subshells from the help print loops increased speed of that by about 300% or so, literally.
2014-03-15 04:28:02 +00:00
gpu_temp=${gpu_temp#*:}
(change version nu) Added nvidia only gpu temp output for multiple gpus. If > 1 gpu screen is detected, it will output the gpu temp data for each discovered screen. For 1 gpu with nvidia, it will show screen nu if you use the -x option, or with -F This is an nvidia proprietary driver feature only.
2009-11-16 19:03:29 +00:00
fi
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
if [[ -n $gpu_temp ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
gpu_temp="${C1}gpu$SEP3${C2} $gpu_temp "
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
;;
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
# then the fan data from main fan array
1)
for (( j=0; j < ${#a_sensors_working[@]}; j++ ))
do
case $j in
0)
# we need to make sure it's either cpu fan OR cpu fan and sys fan 1
if [[ -n ${a_sensors_working[0]} ]];then
cpu_fan="${a_sensors_working[0]}"
elif [[ -z ${a_sensors_working[0]} && -n ${a_sensors_working[1]} ]];then
cpu_fan="${a_sensors_working[1]}"
else
cpu_fan='N/A'
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
cpu_fan="${C1}Fan Speeds (in rpm): cpu$SEP3${C2} $cpu_fan "
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
(( fan_count++ ))
;;
1)
if [[ -n ${a_sensors_working[1]} ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
mobo_fan="${C1}mobo$SEP3${C2} ${a_sensors_working[1]} "
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
(( fan_count++ ))
fi
;;
2)
if [[ -n ${a_sensors_working[2]} ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
ps_fan="${C1}psu$SEP3${C2} ${a_sensors_working[2]} "
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
(( fan_count++ ))
fi
;;
added up to 99 fans, that way it will never max out
2009-12-25 23:05:09 +00:00
[3-9]|[1-9][0-9])
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
if [[ -n ${a_sensors_working[$j]} ]];then
fan_number=$(( $j - 2 )) # sys fans start on array key 5
# wrap after fan 6 total
if [[ $fan_count -lt 7 ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
sys_fans="$sys_fans${C1}sys-$fan_number$SEP3${C2} ${a_sensors_working[$j]} "
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
else
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
sys_fans2="$sys_fans2${C1}sys-$fan_number$SEP3${C2} ${a_sensors_working[$j]} "
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
fi
(( fan_count++ ))
fi
;;
esac
done
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
;;
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
2)
for (( j=0; j < ${#a_sensors_working[@]}; j++ ))
do
case $j in
added up to 99 fans, that way it will never max out
2009-12-25 23:05:09 +00:00
[0-9]|[1-9][0-9])
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
if [[ -n ${a_sensors_working[$j]} ]];then
fan_number=$(( $j + 1 )) # sys fans start on array key 5
# wrap after fan 6 total
if [[ $fan_count -lt 7 ]];then
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
sys_fans="$sys_fans${C1}fan-$fan_number$SEP3${C2} ${a_sensors_working[$j]} "
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
else
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
sys_fans2="$sys_fans2${C1}fan-$fan_number$SEP3${C2} ${a_sensors_working[$j]} "
(change version) Redid the logic for sensors to be totally dynamic and regex driven, no more hacks. This should drastically help with fringe case data handling, and solved all the posted data samples of sensors output
2009-07-29 20:47:22 +00:00
fi
(( fan_count++ ))
fi
;;
esac
done
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
;;
esac
done
fi
(bug fix / tweak) Added back in -s show sensors always to avoid confusion, but turns off if error message for -F output. This is to avoid spam yet still have it work always as expected.
2009-08-04 00:21:54 +00:00
# turning off all output for case where no sensors detected or no sensors output
# unless -s used explicitly. So for -F type output won't show unless valid or -! 1 used
if [[ $b_is_error != 'true' || $B_SHOW_SENSORS == 'true' || $B_TESTING_1 == 'true' ]];then
(change version) By suggestion, now show no sensors output if error condition: missing sensors app OR no sensors output This can be overridden for debugging by override with -! 1 flag, testing 1
2009-08-04 00:12:26 +00:00
temp_data="$cpu_temp$mobo_temp$psu_temp$gpu_temp"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
temp_data=$( create_print_line "Sensors:" "$temp_data${CN}" )
(change version) By suggestion, now show no sensors output if error condition: missing sensors app OR no sensors output This can be overridden for debugging by override with -! 1 flag, testing 1
2009-08-04 00:12:26 +00:00
print_screen_output "$temp_data"
# don't print second or subsequent lines if error data
fan_data="$cpu_fan$mobo_fan$ps_fan$sys_fans"
if [[ $b_is_error != 'true' && -n $fan_data ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
fan_data=$( create_print_line " " "$fan_data${CN}" )
(change version) By suggestion, now show no sensors output if error condition: missing sensors app OR no sensors output This can be overridden for debugging by override with -! 1 flag, testing 1
2009-08-04 00:12:26 +00:00
print_screen_output "$fan_data"
# and then second wrapped fan line if needed
if [[ -n $sys_fans2 ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
fan_data2=$( create_print_line " " "$sys_fans2${CN}" )
(change version) By suggestion, now show no sensors output if error condition: missing sensors app OR no sensors output This can be overridden for debugging by override with -! 1 flag, testing 1
2009-08-04 00:12:26 +00:00
print_screen_output "$fan_data2"
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
fi
fi
eval $LOGFE
}
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
print_system_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
by special Mint request, adding shell/panel type extra extra extra output to desktop, this is so easy to do I decided to just add an -xxx option, for extra extra extra data, no output if nothing detected. No big support issues, and Mint has used inxi by default for a while, so I think it's fine to add this for them.
2012-06-24 08:30:14 +00:00
local system_data='' bits='' desktop_environment='' dm_data='' de_extra_data=''
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
local de_string='' distro_string='' line_starter='System:'
local host_kernel_string='' host_string='' desktop_type='Desktop'
removed hostname app from dependencies and recommends, can use $HOSTNAME instead. Now this might cause some issues later, we'll see.
2011-06-20 18:35:12 +00:00
local host_name=$HOSTNAME
New version, new tarball. Some subtle bug fixes, a kvm virtual machine uses disk id in /proc/partitions of 253, which made the disk totals fail to show up at all. Added that in. Moved sourcing of configuration files to right after initialize_data so that some variables can be forced to different values before the next set of system/app checks. This is to allow specifically turning off, for some headless servers where $DISPLAY is not null due to a bash configuration bug, these: B_SHOW_X_DATA='false' B_RUNNING_IN_X='false' Setting those two to false in inxi.conf will turn off all the X checks etc even if the $DISPLAY is set to non null. Added in support for ksplice kernel version, requires installed uptrack-uname, if that is present and if uptrack-name kernel version is different from uname then it will add (ksplice) to kernel version string, and use ksplice kernel version. Also created a single function get_kernel_version for use by short form/long form inxi output. For intel xeon cpus, trying a work around for a bug in /proc/cpuinfo which fails to show core_id or physical_id for cpus, using siblings / 2 for xeons with no actual core counts. Fixed a bug that made fixes for multimounted partitions fail for disk used. Added in support for also excluding single partitions mounted to different places.
2013-06-14 23:08:38 +00:00
local current_kernel=$( get_kernel_version )
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
local distro="$( get_distro_data )"
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
local tty_session=''
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
new feature, shows which desktop user is running, should work for gnome, kde 3.5, 4, 5, xfce 4, 5, fluxbox, lxde, openbox, blackbox, awesome, fvwm, fvwm-crystal, and we'll add more with user data
2011-05-18 23:00:03 +00:00
# I think these will work, maybe, if logged in as root and in X
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ $B_RUNNING_IN_DISPLAY == 'true' ]];then
cleaned up, refactored irc tty version function
2011-05-25 23:11:31 +00:00
desktop_environment=$( get_desktop_environment )
changed toolkit to show only with -xS, that's not that important.
2011-05-20 05:24:57 +00:00
if [[ -z $desktop_environment ]];then
desktop_environment='N/A'
fi
small change, new version, making dm info, if present, show out of X as well. this can be useful if you for example have ssh'ed into box, and don't remember what dm is running the desktop. Shows N/A if in X if nothing detected, does not show out of X since could be a headless server. Updated man page, new tarball.
2012-06-26 19:22:01 +00:00
by special Mint request, adding shell/panel type extra extra extra output to desktop, this is so easy to do I decided to just add an -xxx option, for extra extra extra data, no output if nothing detected. No big support issues, and Mint has used inxi by default for a while, so I think it's fine to add this for them.
2012-06-24 08:30:14 +00:00
if [[ $B_EXTRA_EXTRA_EXTRA_DATA == 'true' ]];then
de_extra_data=$( get_desktop_extra_data )
if [[ -n $de_extra_data ]];then
de_extra_data=" ${C1}info$SEP3${C2} $de_extra_data"
fi
fi
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
else
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
tty_session=$( get_tty_number )
trying to get tty of console irc client
2011-05-25 22:56:02 +00:00
if [[ -z $tty_session && $B_CONSOLE_IRC == 'true' ]];then
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
tty_session=$( get_tty_console_irc )
trying to get tty of console irc client
2011-05-25 22:56:02 +00:00
fi
cleanup
2011-05-25 21:39:38 +00:00
if [[ -n $tty_session ]];then
tty_session=" $tty_session"
fi
desktop_environment="tty$tty_session"
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
desktop_type='Console'
new feature, shows which desktop user is running, should work for gnome, kde 3.5, 4, 5, xfce 4, 5, fluxbox, lxde, openbox, blackbox, awesome, fvwm, fvwm-crystal, and we'll add more with user data
2011-05-18 23:00:03 +00:00
fi
small change, new version, making dm info, if present, show out of X as well. this can be useful if you for example have ssh'ed into box, and don't remember what dm is running the desktop. Shows N/A if in X if nothing detected, does not show out of X since could be a headless server. Updated man page, new tarball.
2012-06-26 19:22:01 +00:00
# having dm type can be useful if you are accessing remote system
# or are out of X and don't remember which dm is running the system
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
dm_data=$( get_display_manager )
# here we only want the dm info to show N/A if in X
New version; updated man page. Changed slightly the output for x server, in preparation for adding alternate display servers, like Wayland or Mir. Rather than release all the stuff at once I'm going to do it bit by bit. Currently I have not found a wayland iso test cd that boots in virtual box so I will have to wait to really add support there.
2014-03-03 23:31:47 +00:00
if [[ -z $dm_data && $B_RUNNING_IN_DISPLAY == 'true' ]];then
small change, new version, making dm info, if present, show out of X as well. this can be useful if you for example have ssh'ed into box, and don't remember what dm is running the desktop. Shows N/A if in X if nothing detected, does not show out of X since could be a headless server. Updated man page, new tarball.
2012-06-26 19:22:01 +00:00
dm_data='N/A'
fi
# only print out of X if dm_data has info, then it's actually useful, but
# for headless servers, no need to print dm stuff.
if [[ -n $dm_data ]];then
dm_data=" ${C1}dm$SEP3${C2} $dm_data"
fi
fi
patch, moved gcc of kernel to (bits area.
2011-06-18 22:23:23 +00:00
if [[ $B_EXTRA_DATA == 'true' ]];then
adding new -x and -xx, gcc version installed, and with -xx, all detected gcc versions. This goes on the -I output line. This might be changed a bit if it doesn't work on other distros than arch/debian, so I'm leaving this as a patch number only update.
2011-07-06 00:43:58 +00:00
gcc_string=$( get_gcc_kernel_version )
patch, moved gcc of kernel to (bits area.
2011-06-18 22:23:23 +00:00
if [[ -n $gcc_string ]];then
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
gcc_string=" ${C1}gcc$SEP3${C2} $gcc_string"
patch, moved gcc of kernel to (bits area.
2011-06-18 22:23:23 +00:00
fi
fi
new feature, shows which desktop user is running, should work for gnome, kde 3.5, 4, 5, xfce 4, 5, fluxbox, lxde, openbox, blackbox, awesome, fvwm, fvwm-crystal, and we'll add more with user data
2011-05-18 23:00:03 +00:00
# check for 64 bit first
New version, new tarball. Note, this is a refactor release only, and features the core bsd support built in, although inxi will not run in bsd unless the top: #!/bin/bash is changed to #!/usr/local/bin/bash The actual bsd branch can be grabbed from: http://inxi.googlecode.com/svn/branches/bsd/inxi then you can keep that version updated using: inxi -! 15 which will grab the latest bsd version from the svn server. This release also fixes a lot of small bugs that testing for bsd support exposed, but functionally most people should see no difference, I just want to get this version up because there are so many small changes that it's worth having a release. I was going to have the fixed dmidecode for old systems in 1.8.35 but that will have to wait til 1.8.36 Linux users should see no real changes, except maybe a thing or two will work in certain circumstances when it didn't before, like showing MHz on ARM cpus on short inxi.
2013-02-08 04:06:54 +00:00
if [[ -n $( uname -m | grep -E '(x86_64|amd64)' ) ]];then
changed it back, heh
2011-06-24 18:01:08 +00:00
bits="64"
(Version Change) Added 32/64 bit output on System -S line
2008-12-17 04:09:01 +00:00
else
changed it back, heh
2011-06-24 18:01:08 +00:00
bits="32"
(Version Change) Added 32/64 bit output on System -S line
2008-12-17 04:09:01 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
bits=" ($bits bit$gcc_string)"
(Change Version) This is a major version upgrade. Fresh option set, totally upgraded, now supports per line print control. Each line now has a flag to switch it on or off, and those flags will also control full line output with verbosity levels to keep it cleaner. Since this is a core change, the new version is 0.5.0 Also moved all debugging and testing overrides to use characters, not letters: -% - override corrupted data -@ [number 1-10] - Triggers debugging levels 1 - 10 -! - triggers Testing data or functions New option list and menu: ======================================================================================= inxi -h inxi supports the following options. You can combine them, or list them one by one: Examples: inxi -v4 -c6 OR inxi -dc 6 Note: extra output options (eg -f,-H,-p,-s,-x) require a verbosity level of 1 or higher. In other words, they only work if you use either -d or -v1 (or higher) If you start inxi with no arguments, it will show the short form. The following options if used without -d or -v will show just that complete line: C,f,D,G,I,N,P,s,S - you can use these together to show just the lines you want to see. If you use them with a -v level, it will show the full output for that line. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -c Available color schemes. Scheme number is required. Supported schemes: 0-15 Example: inxi -c 11 -C Show full CPU output, including per CPU clockspeed. -d Default output verbosity level, same as: inxi -v 1 -f Show all cpu flags used, not just the short list. -F Show Full, all possible, output for inxi. -D Show full hard disk info, not only model, ie: /dev/sda - ST380817AS - 80.0GB. -G Show graphic card information (+ glx driver and version for non free video drivers). -I Show information: processes, uptime, memory, irc client, inxi version. -N Show network card information. -P Show partition information (shows what -v4 would show, but without extra data). -s Show sound card information. -S Show system information: host name, kernel, distro -U Auto-update script. Note: if you installed as root, you must be root to update, otherwise user is fine. -v Script verbosity levels. Verbosity level number is required. Supported levels: 1-5 Example: inxi -v 4 1 - basic verbose, same as: inxi -d 2 - Also show networking card data 3 - Also show hard disk names as detected. 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot 5 - For multicore systems, also show per core clock speeds. -V inxi version information. Prints information then exits. -x Show extra data: bogomips on cpu. -% Overrides defective or corrupted data. -@ Triggers debugger output. Requires debugging level 1-10.
2008-11-10 22:41:58 +00:00
if [[ $B_SHOW_HOST == 'true' ]];then
removed hostname app from dependencies and recommends, can use $HOSTNAME instead. Now this might cause some issues later, we'll see.
2011-06-20 18:35:12 +00:00
if [[ -z $HOSTNAME ]];then
adding a fallback to use hostname if $HOSTNAME is null, if all these fail, host name will be set to N/A, which also, as with other uses of that, serves as a convenient bug reporter for user output
2011-06-20 18:38:23 +00:00
if [[ -n $( type p hostname ) ]];then
host_name=$( hostname )
fi
if [[ -z $host_name ]];then
host_name='N/A'
fi
removed hostname app from dependencies and recommends, can use $HOSTNAME instead. Now this might cause some issues later, we'll see.
2011-06-20 18:35:12 +00:00
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
host_string="${C1}Host$SEP3${C2} $host_name "
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
host_kernel_string="$host_string${C1}Kernel$SEP3${C2} $current_kernel$bits "
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
de_string="${C1}$desktop_type$SEP3${C2} $desktop_environment$de_extra_data$dm_data "
distro_string="${C1}Distro$SEP3${C2} $distro "
if [[ $( calculate_line_length "$host_kernel_string$de_string" ) -gt $COLS_INNER ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
system_data=$( create_print_line "$line_starter" "$host_kernel_string${CN}" )
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_screen_output "$system_data"
host_kernel_string=''
line_starter=' '
fi
if [[ $( calculate_line_length "$host_kernel_string$de_string$distro_string" ) -gt $COLS_INNER ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
system_data=$( create_print_line "$line_starter" "$host_kernel_string$de_string${CN}" )
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
print_screen_output "$system_data"
host_kernel_string=''
de_string=''
line_starter=' '
fi
system_data="$host_kernel_string$de_string$distro_string"
if [[ -n $system_data ]];then
system_data="$host_kernel_string$de_string$distro_string"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
system_data=$( create_print_line "$line_starter" "$system_data${CN}" )
Improved output, now counts characters and wrapps -S and -G lines, also added tty number for console mode. Now also for greater than 1 video card, prints one per line and puts xorg data line separate always. For 1 card or less, if line is short enough, puts it all one line. System line wraps if too long at desktop, which also shows console and tty number if out of X
2011-05-25 21:32:16 +00:00
print_screen_output "$system_data"
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
fi
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
Major refactoring, variable cleanup, condition tests made more consistent. Still to do, make consistent tests on arrays, those need some careful handling. More tightening of global/local variables.
2008-10-29 21:23:29 +00:00
}
and put the functions in alphabetical order, all done now.
2010-01-09 04:19:15 +00:00
print_unmounted_partition_data()
{
eval $LOGFS
added file system type for unmounted fs, if available. Uses file -s, can add it to sudoers if you want to run it as regular user.
2010-01-09 19:20:40 +00:00
local a_unmounted_data='' line_starter='' unmounted_data='' full_fs=''
and put the functions in alphabetical order, all done now.
2010-01-09 04:19:15 +00:00
local full_dev='' full_size='' full_label='' full_uuid='' full_string=''
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
local bsd_unsupported='This feature is not yet supported for BSD systems.'
and put the functions in alphabetical order, all done now.
2010-01-09 04:19:15 +00:00
if [[ -z ${A_PARTITION_DATA} ]];then
get_partition_data
fi
get_unmounted_partition_data
if [[ ${#A_UNMOUNTED_PARTITION_DATA[@]} -ge 1 ]];then
for (( i=0; i < ${#A_UNMOUNTED_PARTITION_DATA[@]}; i++ ))
do
IFS=","
a_unmounted_data=(${A_UNMOUNTED_PARTITION_DATA[i]})
IFS="$ORIGINAL_IFS"
if [[ -z ${a_unmounted_data[0]} ]];then
full_dev='N/A'
else
full_dev="/dev/${a_unmounted_data[0]}"
fi
New version. Added dynamic wrapping to -G, and also am now wrapping -C per cpu cores speeds, for systems with a lot of them, that will clean up the output. Added dynamic wrapping to --recommends and -c 94-99. These are the main things, there's a few smaller issues with -xx output on -N/-n/-i but those will noly really show with full output and it takes a while to get this stuff stable so maybe some other time, but it's ok for now.
2014-03-25 00:01:20 +00:00
full_dev="${C1}ID$SEP3${C2} $full_dev"
and put the functions in alphabetical order, all done now.
2010-01-09 04:19:15 +00:00
if [[ -z ${a_unmounted_data[1]} ]];then
full_size='N/A'
else
full_size=${a_unmounted_data[1]}
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
full_size="${C1}size$SEP3${C2} $full_size"
and put the functions in alphabetical order, all done now.
2010-01-09 04:19:15 +00:00
if [[ -z ${a_unmounted_data[2]} ]];then
full_label='N/A'
else
full_label=${a_unmounted_data[2]}
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
full_label="${C1}label$SEP3${C2} $full_label"
and put the functions in alphabetical order, all done now.
2010-01-09 04:19:15 +00:00
if [[ -z ${a_unmounted_data[3]} ]];then
full_uuid='N/A'
else
full_uuid=${a_unmounted_data[3]}
fi
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
full_uuid="${C1}uuid$SEP3${C2} $full_uuid"
added file system type for unmounted fs, if available. Uses file -s, can add it to sudoers if you want to run it as regular user.
2010-01-09 19:20:40 +00:00
if [[ -z ${a_unmounted_data[4]} ]];then
full_fs=''
else
totally synced separators in output, now if in console, uses : universally, or if color scheme is 0. This is set dynamically as well. For irc it uses no : except for line starters and item starters, like: ID: or IF: or 1: and so on. Also made cpu per core clock speed the same, using now 1: instead of (1) that saves one character too per core, but makes it all the same, consistent. This also now becomes a user adjustable parameter, via config files, can set irc/console separator character(s) Ok, bored, now on with the day.
2011-07-08 19:55:04 +00:00
full_fs="${C1}fs$SEP3${C2} ${a_unmounted_data[4]}"
added file system type for unmounted fs, if available. Uses file -s, can add it to sudoers if you want to run it as regular user.
2010-01-09 19:20:40 +00:00
fi
full_string="$full_dev $full_size $full_label $full_uuid $full_fs"
and put the functions in alphabetical order, all done now.
2010-01-09 04:19:15 +00:00
if [[ $i -eq 0 ]];then
line_starter='Unmounted:'
else
line_starter=' '
fi
New version, new tarball. Improved B_ALLOW_UPDATES handling, now if set to false, turns off all -h and -H menu options for updating. Also triggers an error message if you use -U or -! <10-16/http://>. Distro maintainers, take note, if you used the B_ALLOW_UPDATES flag, you no longer need to change the code anywhere, the error messages and blocking the -h output for update features is automatic as soon as the flag is set to 'false'. I needed to change the -! handling because -! is now also being used for extra features like -! 31 and -! 32 and probably more stuff in the future, plus the -! 30 used by things like the inxi gui tool being worked on by trash80. Also included in this version are more bsd changes, including initial function for pciconf data parsing, this will be used for -A, -G, and -N options for card data. Further bsd improvements are better error/no data available messages for -D and -o.
2013-02-28 23:35:53 +00:00
# temporary message to indicate not yet supported
if [[ $BSD_TYPE == 'bsd' ]];then
full_string=$bsd_unsupported
fi
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
unmounted_data=$( create_print_line "$line_starter" "$full_string${CN}" )
and put the functions in alphabetical order, all done now.
2010-01-09 04:19:15 +00:00
print_screen_output "$unmounted_data"
done
else
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
unmounted_data=$( create_print_line "Unmounted:" "No unmounted partitions detected${CN}" )
and put the functions in alphabetical order, all done now.
2010-01-09 04:19:15 +00:00
print_screen_output "$unmounted_data"
fi
eval $LOGFE
}
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
print_weather_data()
{
eval $LOGFS
local weather_data='' location_string='' local_time='' time_string='' pressure=''
local a_location='' a_weather='' weather_string='' weather='' temp='' winds='' humidity=''
local time_zone='' observation_time='' city='' state='' country='' altitude=''
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
local heat_index="" wind_chill='' dewpoint='' xxx_humidity=''
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
local openP='(' closeP=')'
New version. Big set of changes: changed all ver: and version: to v:; changed all bash ${var} to $var where appropriate to avoid extra overhead of ${..}; removed 'basename' and replaced with ${path##*/} which avoids unnessary subshells. Fixed dynamic line wraps on -I and -S lines, now those in most cases will work well down to 80 cols. Fixed bug in optical drives, at some point in the last few years, the kernel in /sys changed the path to the optical drive data, added in /ata8/ (example) so both methods are now handled. This should fix a lot of failures to show optical drive brand name etc. Added weechat detection, trying also supybot/limnoria detection in irc client version. There was weechat-curses, but I guess they finally dropped the -curses. Limnoria is a fork of supybot but still uses the supybot program name, but added in limnoria too if they get around to changing that. More dynamic sizing tweaks, more optimization of code. Discovered that dipping into gawk is almost 250x more expensive in terms of execution time than using bash variable. Will change to use bash directly as time goes along where it's safe and accurate. Added handling to support /run paths using directories, like /run/gdm/gdm.pid for dm data.
2014-03-16 22:55:01 +00:00
if [[ $B_IRC == 'true' ]];then
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
openP=''
closeP=''
fi
get_weather_data
# city ";" regionCode ";" regionName ";" countryName ";" countryCode ";" countryCode3
# ";" latitude "," longitude ";" postalCode ";" timeZone
# observationTime ";" localTime ";" weather ";" tempString ";" humidity
# ";" windString ";" pressureString ";" dewpointString ";" heatIndexString
# ";" windChillString ";" siteElevation
if [[ ${#A_WEATHER_DATA[@]} -eq 2 ]];then
IFS=";"
a_location=(${A_WEATHER_DATA[0]})
a_weather=(${A_WEATHER_DATA[1]})
IFS="$ORIGINAL_IFS"
if [[ -n ${a_weather[3]} ]];then
temp=${a_weather[3]}
else
temp='N/A'
fi
if [[ -n ${a_weather[2]} ]];then
weather=" - ${a_weather[2]}"
else
weather=''
fi
if [[ $B_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_weather[5]} ]];then
uppercased the weather options
2013-05-18 02:25:50 +00:00
winds=" ${C1}Wind$SEP3${C2} ${a_weather[5]}"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
fi
fi
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_weather[4]} ]];then
uppercased the weather options
2013-05-18 02:25:50 +00:00
humidity=" ${C1}Humidity$SEP3${C2} ${a_weather[4]}"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
fi
if [[ -n ${a_weather[6]} ]];then
uppercased the weather options
2013-05-18 02:25:50 +00:00
pressure="${C1}Pressure$SEP3${C2} ${a_weather[6]} "
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
fi
fi
tiny change, no version number change, new tarball: changed the second 'Weather:' in the first line to: Conditions: The redundancy looked a bit odd, but for maintainers, it's not an issue, there will be an actual release later in a week or so with resorted weather data probably, we'll see.
2013-05-21 02:41:40 +00:00
weather_string="${C1}Conditions$SEP3${C2} $temp$weather$winds$humidity"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
if [[ -n ${a_weather[1]} ]];then
local_time=" ${a_weather[1]}"
else
local_time=" $(date)"
fi
if [[ $B_EXTRA_DATA == 'true' && -n ${a_location[8]} ]];then
time_zone=" (${a_location[8]})"
fi
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
time_string="${C1}Time$SEP3${C2}$local_time$time_zone"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
if [[ $B_EXTRA_DATA != 'true' ]];then
weather_data="$weather_string $time_string"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
weather_data=$( create_print_line "Weather:" "$weather_data${CN}" )
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
print_screen_output "$weather_data"
else
weather_data="$weather_string"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
weather_data=$( create_print_line "Weather:" "$weather_data${CN}" )
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
print_screen_output "$weather_data"
if [[ $B_EXTRA_EXTRA_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_weather[8]} ]];then
uppercased the weather options
2013-05-18 02:25:50 +00:00
heat_index="${C1}Heat Index$SEP3${C2} ${a_weather[8]} "
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
fi
if [[ -n ${a_weather[9]} ]];then
uppercased the weather options
2013-05-18 02:25:50 +00:00
wind_chill="${C1}Wind Chill$SEP3${C2} ${a_weather[9]} "
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
fi
if [[ -n ${a_weather[7]} ]];then
uppercased the weather options
2013-05-18 02:25:50 +00:00
dew_point="${C1}Dew Point$SEP3${C2} ${a_weather[7]} "
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
fi
if [[ -n ${a_weather[0]} ]];then
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
observation_time=" ${C1}Observation Time$SEP3${C2} ${a_weather[0]} "
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
fi
if [[ $B_OUTPUT_FILTER != 'true' ]];then
if [[ -n ${a_location[0]} ]];then
city=" ${a_location[0]}"
fi
if [[ -n ${a_location[1]} ]];then
state=" ${a_location[1]}"
fi
if [[ -n ${a_location[5]} ]];then
country=" $openP${a_location[5]}$closeP"
fi
if [[ -n ${a_weather[10]} ]];then
uppercased the weather options
2013-05-18 02:25:50 +00:00
altitude=" ${C1}Altitude$SEP3${C2} ${a_weather[10]}"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
fi
uppercased the weather options
2013-05-18 02:25:50 +00:00
location_string="${C1}Location$SEP3${C2}$city$state$country$altitude "
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
else
location_string=$time_string$observation_time
time_string=''
observation_time=''
fi
# the last three are oftenblank
if [[ -z "$heat_index$wind_chill$dew_point" ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
weather_data=$( create_print_line " " "$pressure$location_string${CN}" )
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
print_screen_output "$weather_data"
else
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
weather_data=$( create_print_line " " "$pressure$heat_index$wind_chill$dew_point${CN}" )
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
print_screen_output "$weather_data"
if [[ $B_OUTPUT_FILTER != 'true' ]];then
weather_data=$( create_print_line " " "$location_string" )
print_screen_output "$weather_data"
fi
fi
if [[ -n $time_string$observation_time ]];then
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
weather_data=$( create_print_line " " "$time_string$observation_time${CN}" )
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
print_screen_output "$weather_data"
fi
else
if [[ -n $pressure$time_string ]];then
weather_data="$pressure$time_string"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
weather_data=$( create_print_line " " "$weather_data${CN}" )
New tarball, version, man page. Improved remote weather, now it uses -W, and deprecated -! location=.. That was too hard to type and too hard to remember. Also do more dyanamic reordering of weather output, depending on how much data is present, and how many x options are used. Added error handling for generic deprecated options, and for options that do not have the correct syntax for OPTARG, like with -W. This should about do it for the weather option for now unless I missed something somewhere.
2013-05-26 03:19:38 +00:00
print_screen_output "$weather_data"
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
fi
fi
fi
else
weather_data=$( create_print_line "Weather:" "Weather data failure: $(date)" )
print_screen_output "$weather_data"
some bug fixes, bsd fixes; set gpu default for out of x temps, guessing there at :0.0 screen; changed to if type -p program &>/dev/null;then instead of $(type -p program) subshell. I'll see if getting rid of as many subshells as possible has much impact on performance, certainly makes the code ugly but maybe it's worth it. No version change.
2014-03-17 04:07:31 +00:00
weather_data=$( create_print_line " " "${A_WEATHER_DATA}${CN}" )
New version, new tarball, new man page. Unless disabled by distribution maintainers, offers weather -w option. With -x, -xx-, -xxx, shows more information. Basic line is just weather and system time there. -x adds time zone, which is useful for servers, particurly web servers. -x also adds wind speed. -xx adds humidity and barometric pressure. -xxx adds a possible new line, if data is available, heat index, wind chill, and dew point. -xxx also adds a line for location (blocked by irc/-z) / weather observation time. -z filter applies as usual to location data, removes it in irc by default. -Z overrides override. The api this uses is probably going to be dropped at some point, so this is just going to work while it works, then it will need to be updated at some point, so don't get very attached to it. Also adds option to, with -w: -! location=<location string> This lets users send an alternate location using either <city,state> or <postal code> or <latitude,longitude> (commas for city,state and latitude,longitude are not optional, and the order must be as listed. If There is a developer flag if distro maintainers do not want this enabled, simply set: B_ALLOW_WEATHER='false' before packaging and the weather feature will be disabled.
2013-05-18 02:04:29 +00:00
print_screen_output "$weather_data"
fi
eval $LOGFE
}
put all core features into function containers as first step to break this into logical components
2008-10-28 03:42:28 +00:00
########################################################################
#### SCRIPT EXECUTION
########################################################################
hacked out the dcop stuff for now, that only works if inxi is started as a built in konversation script
2008-10-29 01:59:05 +00:00
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
main $@ ## From the End comes the Beginning
(Change Version - BIG BUG FIX!!) Moved the get params back after setting konvi params
2008-12-15 00:12:05 +00:00
Added EOF marker to let smxi do its integrity check on the file. Without that the install fails.
2008-11-08 19:15:19 +00:00
## note: this EOF is needed for smxi handling, this is what triggers the full download ok
###**EOF**###
Reference in a new issue Copy permalink