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

6234 lines
206 KiB
Plaintext
Raw Normal View History

Initial setup of repo
2008-10-28 00:40:43 +00:00
#!/bin/bash
########################################################################
#### Script Name: inxi
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
#### version: 1.4.99
#### Date: May 18 2011
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
########################################################################
(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
#### inxi is a fork of infobash 3.02, the original bash sys info script 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
####
Initial setup of repo
2008-10-28 00:40:43 +00:00
#### inxi, the universal, portable, system info script for irc.
#### 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
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
#### inxi version: Copyright (C) 2008-11 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
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
####
#### Current script home page: http://techpatterns.com/forums/about1131.html
#### Script svn: http://code.google.com/p/inxi
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
########################################################################
(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
#### 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.
Initial setup of repo
2008-10-28 00:40:43 +00:00
#### DEPENDENCIES
tiny bug fix, change version number because it can cause bad output slightly. Added 2>/dev/null to qdbus, that tool isn't tested for and might not be present, and when absent, throws error
2010-04-10 03:26:27 +00:00
#### bash >=3.0 (bash); df, readlink, stty, tr, uname, wc (coreutils);
#### gawk (gawk); grep (grep); hostname (hostname); lspci (pciutils);
(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
#### free, ps, uptime (procps);
Initial setup of repo
2008-10-28 00:40:43 +00:00
#### Also the proc filesystem should be present and mounted
(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
####
#### Arrays work in bash 2.05b, but "egrep -m" does not
####
(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)
#### -Ax - for audio module version: modinfo (module-init-tools)
#### -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)
#### -i - IP information, local/wan - ifconfig (net-tools)
#### -Ix - view current runlevel while not in X window system (or with -x): runlevel (sysvinit)
#### -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
########################################################################
(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:
#### Indentation: TABS
updated trunk inxi
2009-05-28 20:26:29 +00:00
#### 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.
(No Version Change) Added coding convention item
2008-11-15 23:33:03 +00:00
####
(No Version Change) Fixed top comments a bit
2008-11-11 18:57:47 +00:00
#### All new code/methods must be in a function.
updated trunk inxi
2009-05-28 20:26:29 +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>'.
(No Version Change) Added coding convention item
2008-11-15 23:33:03 +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
#### 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
####
(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:
updated trunk inxi
2009-05-28 20:26:29 +00:00
#### All functions should follow standard naming--verb adjective noun.
#### ie, get_cpu_data
#### All variables MUST be initialized / declared explicitly.
#### All variables should clearly explain what they are, except counters like i, j.
#### Each word of variable must be separated by '_' (underscore) (camel form).
#### Global variables are 'UPPER CASE', at top of script.
#### ie, SOME_VARIABLE=''
#### Local variables are 'lower case' and declared at the top of the function.
#### ie, some_variable=''
#### Locals that will be inherited by child functions have first char capitalized (so you know they are inherited).
#### ie, Some_Variable
(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
####
updated trunk inxi
2009-05-28 20:26:29 +00:00
#### 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:
#### 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.
(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
####
#### 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.
updated trunk inxi
2009-05-28 20:26:29 +00:00
####
#### As with all 'rules' there are acceptions, these are noted where used.
####
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 " " # requires space, not null, to avoid error in for example in irssi
####
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)
###################################################################################
#### dcop and dbus -- these talk back to Konversation from this script
####
#### 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)
####
#### 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
updated trunk inxi
2009-05-28 20:26:29 +00:00
#### gawk arrays: http://www.math.utah.edu/docs/info/gawk_12.html
(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.
added comments for logging
2009-05-29 03:27:19 +00:00
#### LOG FLAGS (logs to $HOME/.inxi/inxi.log with rotate 3 total)
#### -@ 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
(change version) bug fix for cpu data. Make sure all cpu counts are > 1 for tests.
2009-08-05 00:26:28 +00:00
# set to default LANG to avoid locales errors with , or .
LANG=C
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
### Variable initializations: null values
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
CMDL_MAX=''
refactored and ordered get data functions
2008-10-30 05:04:11 +00:00
COLOR_SCHEME=''
(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'
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
DEV_DISK_LABEL=''
DEV_DISK_UUID=''
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
IRC_CLIENT=''
IRC_CLIENT_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
PS_COUNT=5
(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=''
(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
REPO_DATA=''
(change version) added global repo id name for printout, set in get_repo_data, this makes it forward compatible for other repo type systems than apt.
2009-10-12 23:14:29 +00:00
REPO_FILE_ID=''
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 trunk inxi
2009-05-28 20:26:29 +00:00
### primary data array holders ## usage: 'A_<var>'
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=''
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
A_GFX_CARD_DATA=''
Fixed messup with gfx arrays, mixed up glx and gfx
2008-10-30 07:23:45 +00:00
A_GLX_DATA=''
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
A_HDD_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=''
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=''
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=''
(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=''
(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=''
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
A_X_DATA=''
updated trunk inxi
2009-05-28 20:26:29 +00:00
### Boolean true/false globals ## usage: 'B_<var>'
(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
# 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
B_ALLOW_UPDATE='true'
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'
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'
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'
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'
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'
(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'
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
# Running in a shell? Defaults to false, and is determined later.
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
B_RUNNING_IN_SHELL='false'
(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'
(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'
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'
(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'
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
# Set this to 'false' to avoid printing the hostname
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'
(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'
(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'
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'
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'
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
# Test for X running, X apps present
B_SHOW_X_DATA='false'
B_RUNNING_IN_X='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
### 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'
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
B_LSB_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'
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) 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's used when present
FILE_ASOUND_DEVICE='/proc/asound/cards'
FILE_ASOUND_VERSION='/proc/asound/version'
and some more variable ordering
2010-01-09 04:57:00 +00:00
FILE_CPUINFO='/proc/cpuinfo'
(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_LSB_RELEASE='/etc/lsb-release'
and some more variable ordering
2010-01-09 04:57:00 +00:00
FILE_MEMINFO='/proc/meminfo'
(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_MODULES='/proc/modules'
FILE_MOUNTS='/proc/mounts'
FILE_PARTITIONS='/proc/partitions'
and some more variable ordering
2010-01-09 04:57:00 +00:00
FILE_SCSI='/proc/scsi/scsi'
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) 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'
FILE_PATH=''
HDDTEMP_PATH=''
MODINFO_PATH=''
SUDO_PATH=''
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
### Variable initializations: constants
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
lots of cleanup, refactored more
2008-10-31 20:20:44 +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
# 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
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
# Same as runtime parameter.
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
DEFAULT_COLOR_SCHEME=2
# 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=''
(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
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
# Default indentation level
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
INDENT=10
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
# logging eval variables, start and end function: Insert to LOGFS LOGFE when debug level >= 8
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
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
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
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
VERBOSITY_LEVELS=5
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +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
# Clear nullglob, because it creates unpredictable situations with IFS=$'\n' ARR=($VAR) IFS="$ORIGINAL_IFS"
Initial setup of repo
2008-10-28 00:40:43 +00:00
# type constructs. Stuff like [rev a1] is now seen as a glob expansion pattern, and fails, and
updated trunk inxi
2009-05-28 20:26:29 +00:00
# therefore results in nothing.
Initial setup of repo
2008-10-28 00:40:43 +00:00
shopt -u nullglob
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
## info on bash built in: $IFS - http://tldp.org/LDP/abs/html/internalvariables.html
# Backup the current Internal Field Separator
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
ORIGINAL_IFS="$IFS"
updated trunk inxi
2009-05-28 20:26:29 +00:00
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
# These two determine separators in single line output, to force irc clients not to break off sections
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
SEP1='~'
SEP2=' '
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 names/paths - must be non root writable
SCRIPT_DATA_DIR="$HOME/.inxi"
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"
Fixed version number display to handle that part dynamically, fixed more code
2008-10-28 01:27:14 +00:00
SCRIPT_NAME="inxi"
updated trunk inxi
2009-05-28 20:26:29 +00:00
SCRIPT_PATH="" #filled-in in Main
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/'
(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/'
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
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
### Script Localization
# Make sure every program speaks English.
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
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
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
### Output Colors
# 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
)
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
## Actual color variables
C1=''
C2=''
CN=''
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
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
### Distro 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
# 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)
Added pardus to distro supported list, changed date to be straight: day month year
2009-01-23 17:43:15 +00:00
DISTROS_DERIVED="antix-version kanotix-version knoppix-version mandrake-release pardus-release sabayon-release sidux-version 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"
lsb fix for distros with known good lsb files
2008-12-20 18:52:54 +00:00
DISTROS_PRIMARY="gentoo-release redhat-release slackware-version SuSE-release"
DISTROS_LSB_GOOD="mandrake-release mandriva-release mandrakelinux-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
Cleaned up comments, made more consistent and easy to read, added some comments
2008-10-30 22:34:23 +00:00
### Bans Data
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
# Precede a banword with $'\2' to prevent it from being subject to automated escaping by the make_ban_lists routine
Initial setup of repo
2008-10-28 00:40:43 +00:00
# $'\1' gets weird results :
# user@host $ ARR=($'\x01'"one two" three four); echo ${ARR[0]} | hd -v
# 00000000 01 01 6f 6e 65 20 74 77 6f 0a |..one two.|
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
A_NORMAL_BANS=( corporation communications gmbh technologies technology group $'\2'"\<ltd\>" ltd. $'\2'"\<inc\>" inc. $'\2'\<co\> co. corp. "(tm)" "(r)" "®" $'\2'"\(rev ..\)" )
(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
A_CPU_BANS=( @ cpu deca 'dual core' dual-core 'tri core' tri-core 'quad core' quad-core ennea genuine hepta hexa multi octa penta 'processor' processor single triple $'\2'"[0-9.]+ *[MmGg][Hh][Zz]" )
fixed typo in awk in get gfx x data
2008-11-06 21:33:14 +00:00
# after processing, the ban arrays will be put into these:
Corrected misnamed cpu/normal ban lists, no longer calling working lists A_...
2008-11-06 19:59:58 +00:00
BAN_LIST_NORMAL=''
BAN_LIST_CPU=''
more refactoring
2008-10-29 03:03:18 +00:00
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
more fine tunings
2011-04-30 22:45:41 +00:00
USB_NETWORK_SEARCH="Wi-Fi.*Adapter Wireless.*Adapter WLAN.*Adapter Network.*Adapter Atheros Atmel D-Link.*Adapter D-Link.*Wireless Linksys Netgear Ralink Realtek.*Network Realtek.*Wireless Realtek.*WLAN Belkin.*Wireless Belkin.*WLAN Belkin.*Network"
more fine tunings of usb detections
2011-04-30 22:43:44 +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]{3}.*Wireless WNA[0-9]{3} WNDA[0-9]{3} Zonet.*ZEW.*Wireless "
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;
more fine tuning for usb detection
2011-04-30 22:32:39 +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
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
# WARNING: In the main part below (search for 'KONVI')
Initial setup of repo
2008-10-28 00:40:43 +00:00
# there's a check for Konversation-specific config files.
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
# Any one of these can override the above if inxi is run
Initial setup of repo
2008-10-28 00:40:43 +00:00
# from Konversation!
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=''
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
initialize_script_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
updated trunk inxi
2009-05-28 20:26:29 +00:00
# Check for dependencies BEFORE running ANYTHING else except above functions
# Not all distro's have these depends installed by default
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
check_script_depends
check_script_suggested_apps
(change version) found a bug, inxi is using gawk before the depends check, this creates bad output in ubuntu/mint unless it has gawk. Fixed by moving tests to after dependency checks.
2009-11-18 01:54:28 +00:00
# note: this needs to go AFTER depends check because these use gawk
# Do this after sourcing of config overrides so user can customize banwords
# Contrary to my previous belief, "${ARR[@]}" passes a quoted list, not one string
BAN_LIST_NORMAL=$( make_ban_lists "${A_NORMAL_BANS[@]}" )
BAN_LIST_CPU=$( make_ban_lists "${A_CPU_BANS[@]}" )
##echo "BAN_LIST_NORMAL='$BAN_LIST_NORMAL'"
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
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
# 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.
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
updated trunk inxi
2009-05-28 20:26:29 +00:00
### Only continue if depends ok
SCRIPT_PATH=$( dirname $0 )
SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3}' )
### Source global config overrides
if [[ -s /etc/$SCRIPT_NAME.conf ]];then
source /etc/$SCRIPT_NAME.conf
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
# Source user config variables override /etc/inxi.conf variables
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
if [[ -s $HOME/.$SCRIPT_NAME/$SCRIPT_NAME.conf ]];then
source $HOME/.$SCRIPT_NAME/$SCRIPT_NAME.conf
updated trunk inxi
2009-05-28 20:26:29 +00:00
fi
## 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
if [[ -r ${kde_config}${KONVI_CFG} ]];then
source "${kde_config}${KONVI_CFG}"
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"
# "$@" 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
if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
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
if [[ -n $IRC_X_TERM_COLOR_SCHEME && $B_CONSOLE_IRC == 'true' && -n $DISPLAY ]];then
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
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
# 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
## last steps
if [[ $B_RUNNING_IN_SHELL == 'true' && $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
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
}
#### -------------------------------------------------------------------
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
#### basic tests: set script data, booleans, PATH
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.
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
initialize_script_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
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
local path='' sys_path='' added_path='' b_path_found=''
# 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"
# 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
updated trunk inxi
2009-05-28 20:26:29 +00:00
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
IFS="$ORIGINAL_IFS"
PATH="${PATH}${added_path}"
##echo "PATH='$PATH'"
##/bin/sh -c 'echo "PATH in subshell=\"$PATH\""'
# now set the script BOOLEANS for files required to run features
if [[ -d "/proc/" ]];then
some more variable cleanup and syncing
2010-01-09 04:54:17 +00:00
B_PROC_DIR='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
else
error_handler 6
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
(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
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +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 [[ -n $DISPLAY ]];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
B_SHOW_X_DATA='true'
B_RUNNING_IN_X='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_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
(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
}
updated trunk inxi
2009-05-28 20:26:29 +00:00
# No args taken.
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
check_script_suggested_apps()
{
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
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
if [[ -n $( type -p qdbus ) ]];then
B_QDBUS='true'
fi
if [[ -n $( type -p dcop ) ]];then
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.
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
check_script_depends()
'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
(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 app_name='' app_path=''
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
local depends="df free gawk grep hostname lspci ps readlink tr uname uptime wc"
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,
# should add that here as a test, then use the B_SHOW_X_DATA flag to trigger the tests in de function
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
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_RUNNING_IN_X == '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
(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
app_path=$( type -p $app_name )
if [[ -z $app_path ]];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
script_debugger "Resuming in non X mode: $app_name not found in path"
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
B_SHOW_X_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
(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
app_path=$( type -p $app_name )
if [[ -z $app_path ]];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
}
# Filter boilerplate & buzzwords.
# args: $1 - quoted: "$@" array of ban terms
make_ban_lists()
{
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 ban_list=''
# Iterate over $@
## note: this is a weird, non-intuitive method, needs some documentation or rewriting
## if you declare ban_string it stops working, have to read up on this
for ban_string
do
# echo "term=\"$ban_string\"" # >&2
if [[ ${ban_string:0:1} = $'\2' ]];then
ban_list="${ban_list}${ban_list+|}${ban_string:1:${#ban_string}-1}"
else
# Automatically escapes [ ] ( ) . and +
ban_list="${ban_list}${ban_list+|}$( echo "$ban_string" | gawk '{
gsub(/([\[\]+().])/,"\\\\&")
print
}' )"
fi
done
echo "$ban_list"
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
}
# make_ban_lists "${A_CPU_BANS[@]}";exit
# 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 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 i='' a_script_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"
if [[ $B_RUNNING_IN_SHELL == '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
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 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_script_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 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
C1="${!a_script_colors[0]}"
C2="${!a_script_colors[1]}"
CN="${!a_script_colors[2]}"
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
# ((COLOR_SCHEME++)) ## note: why is this? ##
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
if [[ $B_RUNNING_IN_SHELL != 'true' ]];then
irc_clear=''
fi
# first make output neutral so it's just plain default for console client
set_color_scheme "0"
if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
print_screen_output "Welcome to $SCRIPT_NAME! Please select the default $COLOR_SELECTION color scheme."
# 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
print_screen_output "Because there is no way to know your $COLOR_SELECTION foreground/background colors, you can"
print_screen_output "set your color preferences from color scheme option list below. 0 is no colors, 1 neutral."
print_screen_output "After these, there are 3 sets: 1-dark or light backgrounds; 2-light backgrounds; 3-dark backgrounds."
if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
print_screen_output "Please note that this will set the $COLOR_SELECTION preferences only for user: $(whoami)"
fi
print_screen_output "------------------------------------------------------------------------------"
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
if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
echo -n ""
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 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 "------------------------------------------------------------------------------"
print_screen_output "Simply type the number for the color scheme that looks best to your eyes for your $COLOR_SELECTION settings"
print_screen_output "and hit ENTER. NOTE: You can bring this option list up by starting $SCRIPT_NAME with option: -c plus one of these numbers:"
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
print_screen_output "Your selection(s) will be stored here: $config_file"
print_screen_output "Global overrides all individual color schemes. Individual schemes remove the global setting."
print_screen_output "------------------------------------------------------------------------------"
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 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 "Creating and updating config file for $COLOR_SELECTION color scheme now..."
echo "$config_variable=$user_selection" >> $config_file
else
print_screen_output "Updating config file for $COLOR_SELECTION color scheme now..."
sed -i "s/$config_variable=.*/$config_variable=$user_selection/" $config_file
fi
# file exists now so we can go on to cleanup
case $COLOR_SELECTION in
irc|irc-console|irc-virtual-terminal|console|virtual-terminal)
sed -i '/GLOBAL_COLOR_SCHEME=/d' $config_file
;;
global)
sed -i -e '/VIRT_TERM_COLOR_SCHEME=/d' -e '/CONSOLE_COLOR_SCHEME=/d' -e '/IRC_COLOR_SCHEME=/d' \
-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..."
sed -i -e '/VIRT_TERM_COLOR_SCHEME=/d' -e '/GLOBAL_COLOR_SCHEME=/d' -e '/CONSOLE_COLOR_SCHEME=/d' \
-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
print_screen_output "Ok, continuing $SCRIPT_NAME unchanged. You can set the colors anytime by starting with: -c 95 to 99"
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
print_screen_output "------------------------------------------------------------------------------"
print_screen_output "After finding the scheme number you like, simply run this again in a terminal to set the configuration"
print_screen_output "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
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
# args: $1 - error number; $2 - optional, extra information
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 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
5) error_message="dependency not met: $2 not found in path"
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."
;;
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
17)
error_message="Failed to download required file: $2\nMaybe the remote site is down or your networking is broken?"
;;
18)
error_message="$2 downloaded but the file data is corrupted. Unable to continue."
;;
19)
error_message="$2 downloaded but reports error on execution. Unable to continue."
;;
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
echo -e "${spacer}$logged_data" | sed -r 's/\x1b\[[0-9]{1,2}(;[0-9]{1,2}){0,2}m//g' >> $LOG_FILE
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
# 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
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
local wget_error=0 file_contents=''
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"
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 "$?"
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3}' )
print_screen_output "Successfully updated to $2 version: $SCRIPT_VERSION_NUMBER"
print_screen_output "To run the new version, just start $SCRIPT_NAME again."
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
}
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()
{
many bug fixes, the -Nc flag was just not reliable enough to use
2011-05-07 04:42:10 +00:00
local xiin_app='' xiin_data_file='' xiin_download=''
lower cased hostname for file name
2011-05-06 21:48:17 +00:00
local xiin_data_dir="xiin-$(hostname | tr ' ' '-' | tr '[A-Z]' '[a-z]' )-$(date +%Y%m%d)"
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 [[ $B_RUNNING_IN_SHELL == 'true' ]];then
echo "Starting debugging data collection."
echo -n "Checking/creating required directories... "
if [[ ! -d $SCRIPT_DATA_DIR ]];then
mkdir $SCRIPT_DATA_DIR
fi
echo 'completed'
cd $SCRIPT_DATA_DIR
if [[ -d $xiin_data_dir ]];then
echo 'Deleting previous xiin data directory...'
rm -rf $xiin_data_dir
fi
mkdir $xiin_data_dir
if [[ -f $xiin_data_dir.tar.gz ]];then
echo 'Deleting previous tar.gz file...'
rm -f $xiin_data_dir.tar.gz
fi
xiin_data_file=$SCRIPT_DATA_DIR/$xiin_data_dir/xiin-sys.txt
echo 'Downloading required tree traverse tool xiin...'
many bug fixes, the -Nc flag was just not reliable enough to use
2011-05-07 04:42:10 +00:00
# -Nc is creating really weird download anomolies, so using -O instead
xiin_download="$( wget -q -O - http://inxi.googlecode.com/svn/branches/xiin/xiin )"
modified wget a bit for xiin to make it more robust, I hope
2011-05-06 21:15:09 +00:00
# if nothing got downloaded kick out error, otherwise we'll use an older version
if [[ $? -gt 0 && ! -f xiin ]];then
error_handler 17 'xiin'
many bug fixes, the -Nc flag was just not reliable enough to use
2011-05-07 04:42:10 +00:00
elif [[ -n $( grep -s 'checkPython' <<< "$xiin_download" ) || -f xiin ]];then
if [[ -n $( grep -s 'checkPython' <<< "$xiin_download" ) ]];then
echo 'Updating xiin from remote location'
echo "$xiin_download" > xiin
else
echo 'Using local xiin due to download failure'
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
echo 'Running xiin tool now on /sys...'
tweaked xiin exit error handling
2011-05-07 03:40:57 +00:00
python ./xiin -d /sys -f $xiin_data_file
if [[ $? -ne 0 ]];then
echo "xiin exited with error $? - removing data file before exiting."
rm -f $xiin_data_file
error_handler 19 'xiin'
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
else
error_handler 18 'xiin'
fi
changed from lspci -vv to lspci -v for xiin data collection
2011-05-07 01:46:58 +00:00
echo 'Collecting related system info now, lsusb, lspci, lspci -v, Xorg.log data'
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
lsusb > $xiin_data_dir/lsusb.txt
lspci > $xiin_data_dir/lspci.txt
changed from lspci -vv to lspci -v for xiin data collection
2011-05-07 01:46:58 +00:00
lspci -v > $xiin_data_dir/lspci-v.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
cat /var/log/Xorg.0.log 2>/dev/null | tail -n 200 > $xiin_data_dir/xorg-200.txt
echo 'Creating tar.gz compressed file of this material now. Contents:'
echo '-------------------------'
tar -cvzf $xiin_data_dir.tar.gz $xiin_data_dir
echo '-------------------------'
echo 'Cleaning up leftovers...'
rm -rf $xiin_data_dir
echo 'Testing gzip file integrity...'
gzip -t $xiin_data_dir.tar.gz
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.'
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
rm -f $xiin_data_dir.tar.gz
else
echo 'All done, you can find your data gzipped directory here:'
echo $SCRIPT_DATA_DIR/$xiin_data_dir.tar.gz
added anon ftp information
2011-05-06 21:27:57 +00:00
echo 'You can upload this here using most file managers: ftp.techpatterns.com/incoming'
echo 'then let a maintainer know it is uploaded.'
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
}
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
local print_data="$( echo -e "$1" )"
(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
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
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"
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
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
Tweaked output, fixed bugs, mostly done with major refactoring now
2008-10-29 23:02:24 +00:00
printf "${C1}%-${INDENT}s${C2} %s" "$1" "$2"
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
(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
local opt='' wget_test='' update_flags='U!:'
(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
(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 distro maintainers want to not allow updates, turn off that option for users
(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 == 'false' ]];then
update_flags=''
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
# the short form only runs if no args output args are used
# no need to run through these if there are no args
if [[ -n $1 ]];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
while getopts Ac:CdDfFGhHiIlnNopPrsSt:uv:Vx%@:${update_flags} 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'
;;
(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'
;;
d) VERBOSITY_LEVEL=1
use_short='false'
;;
D) B_SHOW_DISK='true'
use_short='false'
;;
f) B_SHOW_CPU='true'
B_CPU_FLAGS_FULL='true'
use_short='false'
;;
F) VERBOSITY_LEVEL=$VERBOSITY_LEVELS
B_EXTRA_DATA='true'
B_SHOW_DISK='true'
B_SHOW_PARTITIONS='true'
B_SHOW_AUDIO='true'
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'
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'
;;
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'
B_EXTRA_DATA='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'
;;
(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
o) B_SHOW_UNMOUNTED_PARTITIONS='true'
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'
;;
(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) 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
PS_COUNT=$( grep -Eo '[0-9]+' <<< $OPTARG )
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
(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
VERBOSITY_LEVEL="$OPTARG"
if [[ $OPTARG -gt 0 ]];then
use_short='false'
(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
(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
;;
U) script_self_updater "$SCRIPT_DOWNLOAD" 'svn server'
;;
V) print_version_info
exit 0
;;
x) B_EXTRA_DATA='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'
;;
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 [[ -n $( grep -E "^([1-9]|1[0-1])$" <<< $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
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
;;
11)
debug_data_collector
;;
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
;;
added branches three and four support
2009-02-18 06:28:40 +00:00
10)
script_self_updater "$SCRIPT_DOWNLOAD_DEV" 'dev server'
(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
;;
added branches three and four support
2009-02-18 06:28:40 +00:00
11)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_1" 'svn: branch one server'
(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
;;
added branches three and four support
2009-02-18 06:28:40 +00:00
12)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_2" 'svn: branch two server'
;;
13)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_3" 'svn: branch three server'
;;
14)
script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_4" 'svn: branch four server'
(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
;;
(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
http*)
(Change Version) Cleaned up and refactored download error handling, put it all in download function, out of get_params, which should only set params, not execute special case code blocks. Sorry cathbard ;-)
2008-11-13 02:18:33 +00:00
script_self_updater "$OPTARG" 'alt server'
(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
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 ))
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) 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 "$SCRIPT_NAME supports the following options. You can combine them, or list them"
print_screen_output "one by one: Examples: $SCRIPT_NAME -v4 -c6 OR $SCRIPT_NAME -dDc 6"
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) 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_screen_output "If you start $SCRIPT_NAME with no arguments, it will show the short form."
print_screen_output "The following options if used without -d or -v will show just that complete line:"
(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_screen_output "A,C,D,G,I,N,P,S - you can use these together to show just the lines you want to see."
(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 "If you use them with a -v level (or -d), it will show the full output for that line "
print_screen_output "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:"
(no version change) But update packaging anyway. This just updates the -h menu to better reflect what the options currently do.
2009-03-17 05:14:12 +00:00
print_screen_output "-A Show Audio/sound card information."
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 "-c Available color schemes. Scheme number is required. Color selectors run a color selector option"
print_screen_output " prior to $SCRIPT_NAME starting which lets you set the config file value for the selection."
print_screen_output " Supported color schemes: 0-$color_scheme_count Example: $SCRIPT_NAME -c 11"
print_screen_output " Supported color selectors: 94 (console, no X); 95 (terminal, X); 96 (irc, X);"
help tweak
2011-04-30 18:42:03 +00:00
print_screen_output " 97 (irc, X, in terminal); 98 (irc, no X); 99 (global). NOTE: irc and global only show safe color set."
(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_screen_output "-C Show full CPU output, including per CPU clockspeed."
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_screen_output "-d Default output verbosity level, same as: $SCRIPT_NAME -v 1"
(no version change) But update packaging anyway. This just updates the -h menu to better reflect what the options currently do.
2009-03-17 05:14:12 +00:00
print_screen_output "-D Show full hard Disk info, not only model, ie: /dev/sda ST380817AS 80.0GB."
(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_screen_output "-f Show all cpu flags used, not just the short list. Not shown with -F to avoid spamming."
tweaked help menu for -F option, excluded -t noted.
2010-02-13 04:45:48 +00:00
print_screen_output "-F Show Full output for $SCRIPT_NAME. Does not show extra verbose options like -f -u -l -o -p or -t"
(no version change) But update packaging anyway. This just updates the -h menu to better reflect what the options currently do.
2009-03-17 05:14:12 +00:00
print_screen_output "-G Show Graphic card information (card, x type, resolution, glx renderer, version)."
(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_screen_output "-i Show Wan IP address, and shows local interfaces (requires ifconfig network tool)."
print_screen_output " Not shown with -F for user security reasons, you shouldn't paste your local/wan IP."
(no version change) But update packaging anyway. This just updates the -h menu to better reflect what the options currently do.
2009-03-17 05:14:12 +00:00
print_screen_output "-I Show Information: processes, uptime, memory, irc client, inxi version."
(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
print_screen_output "-l Show partition labels. Default: short partition -P. For full -p output, use: -pl (or -plu)."
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_screen_output "-n Show Advanced Network card information. Same as -Nnx. Shows interface, speed, mac id, state, etc."
print_screen_output "-N Show Network card information. With -x, shows PCI BusID, Port number."
(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
print_screen_output "-o Show unmounted partition information (includes UUID and LABEL if available)."
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
print_screen_output " Shows file system type if you have file installed, if you are root OR if you have"
print_screen_output " added to /etc/sudoers (sudo v. 1.7 or newer): <username> ALL = NOPASSWD: /usr/bin/file (sample)"
(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_screen_output "-p Show full partition information (-P plus all other detected partitions)."
(no version change) But update packaging anyway. This just updates the -h menu to better reflect what the options currently do.
2009-03-17 05:14:12 +00:00
print_screen_output "-P Show Partition information (shows what -v 4 would show, but without extra data)."
print_screen_output " Shows, if detected: / /boot /home /tmp /usr /var. Use -p to see all mounted partitions."
order order...
2010-02-01 06:10:31 +00:00
print_screen_output "-r Show distro repository data. Currently supported repo types: APT; PACMAN; PISI; YUM."
(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
print_screen_output "-s Show sensors output (if sensors installed/configured): mobo/cpu/gpu temp; detected fan speeds."
print_screen_output " Gpu temp only for Fglrx/Nvidia drivers. Nvidia shows screen number for > 1 screens."
added comments, updated help to show desktop for S
2011-05-19 00:23:29 +00:00
print_screen_output "-S Show System information: host name, kernel, desktop environment (if in X), distro"
(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
print_screen_output "-t Show processes. Requires extra options: c (cpu) m (memory) cm (cpu+memory). If followed by numbers 1-20,"
print_screen_output " shows that number of processes for each type (default: $PS_COUNT; if in irc, max: 5): -t cm10"
help menu tweak
2010-02-13 04:47:06 +00:00
print_screen_output " Make sure to have no space between letters and numbers (-t cm10 -right, -t cm 10 -wrong)."
(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
print_screen_output "-u Show partition UUIDs. Default: short partition -P. For full -p output, use: -pu (or -plu)."
cleanup
2008-11-01 21:45:17 +00:00
print_screen_output "-v Script verbosity levels. Verbosity level number is required."
(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
print_screen_output " Supported levels: 0-${VERBOSITY_LEVELS} Example: $SCRIPT_NAME -v 4"
print_screen_output " 0 - short output, same as: $SCRIPT_NAME"
For usage, added verbosity level explanations, 0-5 currently.
2008-11-01 21:50:52 +00:00
print_screen_output " 1 - basic verbose, same as: $SCRIPT_NAME -d"
Made -v3 show hard disk names, and -v2 networking information, this gives 3 an actual function, which it didn't have before. Updated help to show this.
2008-11-01 21:55:12 +00:00
print_screen_output " 2 - Also show networking card data"
print_screen_output " 3 - Also show hard disk names as detected."
print_screen_output " 4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot"
updated help menu for -v 5
2009-08-07 00:36:15 +00:00
print_screen_output " 5 - For multicore systems, also shows: per core clock speeds; audio card; full disk data."
(no version change) But update packaging anyway. This just updates the -h menu to better reflect what the options currently do.
2009-03-17 05:14:12 +00:00
print_screen_output "-x Show extra data: bogomips on Cpu; driver version (if available) for Network/Audio;"
changed toolkit to show only with -xS, that's not that important.
2011-05-20 05:24:57 +00:00
print_screen_output " for network, audio cards, shows PCI Bus ID number also; for System, shows Desktop toolkit if avaliable"
(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
print_screen_output " direct rendering status for Graphics (in X). Only works with verbose or line output;"
print_screen_output " shows (for single gpu, nvidia driver) screen number gpu is running on."
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
print_screen_output " Shows hdd temp with disk data if you have hddtemp installed, if you are root OR if you have"
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
print_screen_output " added to /etc/sudoers (sudo v. 1.7 or newer): <username> ALL = NOPASSWD: /usr/sbin/hddtemp (sample)"
help typo fix
2010-03-21 05:06:02 +00:00
print_screen_output " For -t, adds memory use output to cpu (-tx c), and cpu use to memory (-tx m)."
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:"
Removed -H in normal output, my experience has shown me that exposing advanced testing options just leads users to do things they shouldn't do. -H is only for devs, that is.
2008-11-19 20:10:52 +00:00
print_screen_output "-h - this help menu."
(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
print_screen_output "-U Auto-update script. Note: if you installed as root, you"
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
print_screen_output " must be root to update, otherwise user is fine."
(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
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_screen_output "-V $SCRIPT_NAME version information. Prints information then exits."
(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_screen_output "-% Overrides defective or corrupted data."
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
print_screen_output "-@ Triggers debugger output. Requires debugging level 1-10 (8-10 - logging)."
print_screen_output " 8 - basic logging; 9 - full file/sys info logging; 10 - color logging."
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
print_screen_output " 11 - No logging, creates tar.gz file of user data from lsusb/lspci/Xorg.0.log, and xiin read of /sys."
(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):"
(No Version Change) Help menu tweak, don't worry about this one.
2008-11-19 20:32:11 +00:00
print_screen_output "-! 1 - Sets testing flag B_TESTING_1='true' to trigger testing condition 1."
print_screen_output "-! 2 - Sets testing flag B_TESTING_2='true' to trigger testing condition 2."
print_screen_output "-! 3 - Sets flags B_TESTING_1='true' and B_TESTING_2='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
print_screen_output "-! 10 - Triggers an update from the primary dev download server instead of svn."
print_screen_output "-! 11 - Triggers an update from svn branch one - if present, of course."
print_screen_output "-! 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
print_screen_output "-! 13 - Triggers an update from svn branch three - if present, of course."
print_screen_output "-! 14 - Triggers an update from svn branch four - if present, of course."
(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 "-! <http://......> - Triggers an update from whatever server you list."
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 " "
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
}
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()
{
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
local last_modified=$( grep -im 1 'date:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3,$4,$5}' )
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
help menu output tweak
2008-10-31 04:27:00 +00:00
print_screen_output "$SCRIPT_NAME - the universal, portable, system info script for irc."
Updated -V/--version information to better reflect inxi status, cleaned up a few little glitches.
2008-10-31 04:24:09 +00:00
print_screen_output "Version: $SCRIPT_VERSION_NUMBER"
print_screen_output "Script Last Modified: $last_modified"
Added both -V and -U update output that tells user where script is located in system
2008-11-04 02:16:50 +00:00
print_screen_output "Script Location: $SCRIPT_PATH"
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 " "
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_screen_output "Tested with Irssi, Xchat, Konversation, BitchX, KSirc, ircII,"
print_screen_output "Gaim/Pidgin, Weechat, KVIrc and Kopete."
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 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
print_screen_output "This script is a fork of Infobash 3.02, which is:"
print_screen_output "Copyright (C) 2005-2007 Michiel de Boer a.k.a. locsmif"
Updated -V/--version information to better reflect inxi status, cleaned up a few little glitches.
2008-10-31 04:24:09 +00:00
print_screen_output "Subsequent changes and modifications (after Infobash 3.02) are:"
made version copyright update automatically
2011-05-07 04:02:44 +00:00
print_screen_output "Copyright (C) 2008-$(date +%y) Scott Rogers, Harald Hope, aka trash80 & h2"
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 " "
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_screen_output "This program is free software; you can redistribute it and/or modify"
print_screen_output "it under the terms of the GNU General Public License as published by"
print_screen_output "the Free Software Foundation; either version 3 of the License, or"
print_screen_output "(at your option) any later version."
}
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
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
local irc_client_path='' irc_client_path_lower='' non_native_konvi='' i=''
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
local b_non_native_app='false' pppid='' app_working_name=''
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
local b_qt4_konvi='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
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 tty >/dev/null;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
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
B_RUNNING_IN_SHELL='true'
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
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
irc_client_path=$( readlink /proc/$PPID/exe )
Trying a sidux patch from infobash for the wrong output, shell instead of xchat etc
2008-11-08 20:39:27 +00:00
irc_client_path_lower=$( tr '[:upper:]' '[:lower:]' <<< $irc_client_path )
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
app_working_name=$( basename $irc_client_path_lower )
# 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
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
case $app_working_name in
(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
bash|dash|sh|perl*) # We want to know who wrapped it into the shell or perl.
Fixed bug in bash method that fails in etch, old bash.
2008-11-09 08:26:06 +00:00
pppid="$( ps -p $PPID -o ppid --no-headers | sed 's/ //g' )"
if [[ -n $pppid && -f /proc/$pppid/exe ]];then
irc_client_path="$( readlink /proc/$pppid/exe )"
irc_client_path_lower="$( tr '[:upper:]' '[:lower:]' <<< $irc_client_path )"
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
app_working_name=$( basename $irc_client_path_lower )
Fixed bug in bash method that fails in etch, old bash.
2008-11-09 08:26:06 +00:00
b_non_native_app='true'
fi
;;
esac
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
# replacing loose detection with tight detection, bugs will be handled with app names
# as they appear.
case $app_working_name in
added finch to trunk, reordered case list
2009-06-07 01:55:40 +00:00
# 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
}' )"
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_CONSOLE_IRC='true'
added finch to trunk, reordered case list
2009-06-07 01:55:40 +00:00
IRC_CLIENT="BitchX"
;;
finch)
IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
print $2
}' )"
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_CONSOLE_IRC='true'
added finch to trunk, reordered case list
2009-06-07 01:55:40 +00:00
IRC_CLIENT="Finch"
;;
gaim)
IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
print $2
}' )"
IRC_CLIENT="Gaim"
;;
ircii)
IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
print $3
}' )"
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_CONSOLE_IRC='true'
added finch to trunk, reordered case list
2009-06-07 01:55:40 +00:00
IRC_CLIENT="ircII"
;;
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
irssi-text|irssi)
(change version) quassel support added, 3 cases, for quassel, quasselclient, and quassel monolithic (unused now)) Also expanded all the gawk in that section to make it more consistent.
2009-03-13 22:39:49 +00:00
IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
print $2
}' )"
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_CONSOLE_IRC='true'
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
IRC_CLIENT="Irssi"
Initial setup of repo
2008-10-28 00:40:43 +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
konversation) ## konvi < 1.2 (qt4)
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
# this is necessary to avoid the dcop errors from starting inxi as a /cmd started script
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 [[ $b_non_native_app == 'true' ]];then ## true negative is confusing
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
KONVI=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
else # if native app
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
KONVI=1
fi
Cleaned up more awk one liner flow controls, removed ; and added new lines, please check to make sure I didn't mess up!
2008-11-05 23:54:14 +00:00
IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk '
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
/Konversation:/ {
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
for ( i=2; i<=NF; i++ ) {
if (i == 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
print $i
}
else {
printf $i" "
}
}
exit
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
}' )"
Made just the one test, for sh|bash|dash|perl that handles now all cases, including konversation
2008-11-09 04:16:13 +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
T=($IRC_CLIENT_VERSION)
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 [[ ${T[0]} == *+* ]];then
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
# < Sho_> locsmif: The version numbers of SVN versions look like this:
# "<version number of last release>+ #<build number", i.e. "1.0+ #3177" ...
Initial setup of repo
2008-10-28 00:40:43 +00:00
# for releases we remove the + and build number, i.e. "1.0" or soon "1.0.1"
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
IRC_CLIENT_VERSION=" CVS $IRC_CLIENT_VERSION"
Initial setup of repo
2008-10-28 00:40:43 +00:00
T2="${T[0]/+/}"
else
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
IRC_CLIENT_VERSION=" ${T[0]}"
Initial setup of repo
2008-10-28 00:40:43 +00:00
T2="${T[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
# Remove any dots except the first, and make sure there are no trailing zeroes,
(change version) quassel support added, 3 cases, for quassel, quasselclient, and quassel monolithic (unused now)) Also expanded all the gawk in that section to make it more consistent.
2009-03-13 22:39:49 +00:00
T2=$( echo "$T2" | gawk '{
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
sub(/\./, " ")
gsub(/\./, "")
sub(/ /, ".")
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("%g\n", $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
}' )
Initial setup of repo
2008-10-28 00:40:43 +00:00
# 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.
(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
if [[ ${T2} -lt 1 ]];then
more refactoring and code cleanup, it's starting to get readable now
2008-10-28 03:01:58 +00:00
DCOPOBJ="Konversation"
fi
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
IRC_CLIENT="Konversation"
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
;;
added finch to trunk, reordered case list
2009-06-07 01:55:40 +00:00
kopete)
IRC_CLIENT_VERSION=" $( kopete -v | gawk '
/Kopete:/ {
(change version) quassel support added, 3 cases, for quassel, quasselclient, and quassel monolithic (unused now)) Also expanded all the gawk in that section to make it more consistent.
2009-03-13 22:39:49 +00:00
print $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
exit
}' )"
added finch to trunk, reordered case list
2009-06-07 01:55:40 +00:00
IRC_CLIENT="Kopete"
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
;;
added finch to trunk, reordered case list
2009-06-07 01:55:40 +00:00
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"
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
;;
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
pidgin)
(change version) quassel support added, 3 cases, for quassel, quasselclient, and quassel monolithic (unused now)) Also expanded all the gawk in that section to make it more consistent.
2009-03-13 22:39:49 +00:00
IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
print $2
}' )"
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
IRC_CLIENT="Pidgin"
Initial setup of repo
2008-10-28 00:40:43 +00:00
;;
(change version) quassel support added, 3 cases, for quassel, quasselclient, and quassel monolithic (unused now)) Also expanded all the gawk in that section to make it more consistent.
2009-03-13 22:39:49 +00:00
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
;;
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
weechat-curses)
(change version) quassel support added, 3 cases, for quassel, quasselclient, and quassel monolithic (unused now)) Also expanded all the gawk in that section to make it more consistent.
2009-03-13 22:39:49 +00:00
IRC_CLIENT_VERSION=" $( $irc_client_path -v ) "
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_CONSOLE_IRC='true'
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
IRC_CLIENT="Weechat"
Initial setup of repo
2008-10-28 00:40:43 +00:00
;;
added finch to trunk, reordered case list
2009-06-07 01:55:40 +00:00
xchat-gnome)
IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
print $2
}' )"
IRC_CLIENT="X-Chat-Gnome"
Initial setup of repo
2008-10-28 00:40:43 +00:00
;;
added finch to trunk, reordered case list
2009-06-07 01:55:40 +00:00
xchat)
IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
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
print $2
}' )"
added finch to trunk, reordered case list
2009-06-07 01:55:40 +00:00
IRC_CLIENT="X-Chat"
Initial setup of repo
2008-10-28 00:40:43 +00:00
;;
added finch to trunk, reordered case list
2009-06-07 01:55:40 +00:00
# then do some perl type searches, do this last since it's a wildcard search
(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
perl*|ksirc|dsirc)
Fixed some more weaknesses with the client detection function.
2008-11-09 08:57:27 +00:00
unset IRC_CLIENT_VERSION
# KSirc is one of the possibilities now. KSirc is a wrapper around dsirc, a perl client
more refactoring
2008-10-28 02:24:11 +00:00
get_cmdline $PPID
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
for (( i=0; i <= $CMDL_MAX; i++ ))
more code cleanup
2008-10-28 02:07:37 +00:00
do
lots of cleanup, refactored more
2008-10-31 20:20:44 +00:00
case ${A_CMDL[i]} in
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
*dsirc*)
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
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
;;
Initial setup of repo
2008-10-28 00:40:43 +00:00
esac
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
done
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_CONSOLE_IRC='true'
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 $IRC_CLIENT_VERSION ]];then
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
IRC_CLIENT="Unknown Perl client"
more code cleanup
2008-10-28 02:07:37 +00:00
fi
Initial setup of repo
2008-10-28 00:40:43 +00:00
;;
added finch to trunk, reordered case list
2009-06-07 01:55:40 +00:00
# then unset, set unknown data
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
*)
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
IRC_CLIENT="Unknown : ${irc_client_path##*/}"
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
Initial setup of repo
2008-10-28 00:40:43 +00:00
;;
esac
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 [[ $SHOW_IRC -lt 2 ]];then
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
Initial setup of repo
2008-10-28 00:40:43 +00:00
fi
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
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
IRC_CLIENT="PPID=\"$PPID\" - empty?"
unset IRC_CLIENT_VERSION
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
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
}
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,
## and all other irc clients are not running.
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
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 [[ -n $konvi_dbus_exist && -e /usr/share/kde4/apps/konversation ]]; then
konvi_pid=$( ps -A | grep -i 'konversation' )
konvi_pid=$( echo $konvi_pid | gawk '{ print $1 }' )
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' )
konvi_qt4_client=$( echo "$konvi_qt4_ver" | gawk '{ print $2 }' )
if [[ $konvi_qt4_client > 1.1 ]]; then
b_is_qt4='true'
fi
fi
else
konvi_qt4="qt3"
b_is_qt4='false'
fi
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
(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 i='' alsa_data='' alsa_driver='' device_count='' lsusb_path=''
(change version) added damentz usb audio patch, debugged, cleaned up, should be working, we'll see.
2009-02-18 06:17:45 +00:00
local usb_proc_file='' array_count='' usb_id='' usb_data=''
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
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
device_count=$( echo "$Lspci_Data" | egrep -ic '(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
(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
alsa_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
$0 !~ /modem/ || $0 !~ /usb/ {
(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
}
(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_ASOUND_DEVICE )
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.
alsa_driver=$( echo $alsa_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.
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
A_AUDIO_DATA=( $( echo "$Lspci_Data" | gawk -F ': ' -v alsaDriver="$alsa_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/ {
(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
audioCard=gensub(/^[0-9a-f:.]+ [^:]+: (.+)$/,"\\1","g",$0)
# 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]
}
else if ( alsaDriver != "" ) {
useDrivers=alsaDriver
}
(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
(change version) added damentz usb audio patch, debugged, cleaned up, should be working, we'll see.
2009-02-18 06:17:45 +00:00
# alsa usb detection by damentz
# for every sound card symlink in /proc/asound - display information about it
(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
lsusb_path=$( type -p lsusb )
(change version) added damentz usb audio patch, debugged, cleaned up, should be working, we'll see.
2009-02-18 06:17:45 +00:00
for usb_proc_file in /proc/asound/*
do
# if lsusb exists, the file is a symlink, and contains an important usb exclusive file: continue
(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 $lsusb_path && -L $usb_proc_file && -e $usb_proc_file/usbid ]]; then
(change version) added damentz usb audio patch, debugged, cleaned up, should be working, we'll see.
2009-02-18 06:17:45 +00:00
# send error messages of lsusb to /dev/null as it will display a bunch if not a super user
a few cosmetic code tweaks to 1.0.3, no version change
2009-02-18 06:45:49 +00:00
# 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 :)
(change version) added damentz usb audio patch, debugged, cleaned up, should be working, we'll see.
2009-02-18 06:17:45 +00:00
usb_id=$( cat $usb_proc_file/usbid )
(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
usb_data=$( $lsusb_path -v 2>/dev/null | grep "$usb_id" )
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' "usb_data:\n$usb_data"
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
usb_data=$( gawk '
BEGIN {
IGNORECASE=1
synched audio output to use usb id as well if -x runs
2011-04-30 23:10:06 +00:00
string=""
separator=""
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
}
{
(change version) added damentz usb audio patch, debugged, cleaned up, should be working, we'll see.
2009-02-18 06:17:45 +00:00
gsub( /,/, " ", $0 )
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
synched audio output to use usb id as well if -x runs
2011-04-30 23:10:06 +00:00
gsub(/ [ \t]+/, " ", $0)
for ( i=7; i<= NF; i++ ) {
string = string separator $i
separator = " "
}
if ( $6 != "" ){
print string ",snd-usb-audio,,," $6
(change version) added damentz usb audio patch, debugged, cleaned up, should be working, we'll see.
2009-02-18 06:17:45 +00:00
}
}' <<< "$usb_data" )
# this method is interesting, it shouldn't work but it does
#A_AUDIO_DATA=( "${A_AUDIO_DATA[@]}" "$usb_data,snd-usb-audio,," )
# 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[@]}
synched audio output to use usb id as well if -x runs
2011-04-30 23:10:06 +00:00
A_AUDIO_DATA[$array_count]="$usb_data"
(change version) added damentz usb audio patch, debugged, cleaned up, should be working, we'll see.
2009-02-18 06:17:45 +00:00
fi
fi
done
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"
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
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
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "A_AUDIO_DATA: ${A_AUDIO_DATA[@]}"
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
(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
local alsa_data=''
# 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
Added towol fix for removing second line in alsa version output if compiled by second user
2008-11-14 20:26:15 +00:00
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
}
(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/ {
gsub( "Driver | [(].*[)]|\.$","",$0 )
gsub(/,/, " ", $0)
gsub(/^ +| +$/, "", $0)
gsub(/ [ \t]+/, " ", $0)
if ( $0 != "" ){
print $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
}' $FILE_ASOUND_VERSION )
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
(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
echo "$alsa_data"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "alsa_data: $alsa_data"
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
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
(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_physical_count=${A_CPU_TYPE_PCNT_CCNT[1]}
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
local cpu_core_count=${A_CPU_TYPE_PCNT_CCNT[2]}
(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_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
case $cpu_core_count 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
# 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" )
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "A_CPU_CORE_DATA: ${A_CPU_CORE_DATA[@]}"
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
}
(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
(Version Change) Added 32/64 bit output on System -S line
2008-12-17 04:09:01 +00:00
local i='' j='' cpu_array_nu='' a_cpu_working='' multi_cpu='' bits=''
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'
(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
A_CPU_DATA=( $( gawk -F': ' '
BEGIN {
IGNORECASE=1
}
# 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]+:/ {
nr = $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
/^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
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
(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
/^flags/ {
cpu[nr, "flags"] = $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
(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++ ) {
print cpu[i, "model"] "," cpu[i, "speed"] "," cpu[i, "cache"] "," cpu[i, "flags"] "," cpu[i, "bogomips"] "," cpu[nr, "vendor"]
}
if (!min) {
print "not found"
exit
}
if (min != max) {
printf("Min:%s%s Max:%s%s\n", min, "Mhz", max, "Mhz")
}
else {
printf("%s %s\n", max, "Mhz")
}
(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_CPUINFO ) )
log_function_data 'cat' "$FILE_CPUINFO"
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
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
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"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "A_CPU_DATA: ${A_CPU_DATA[@]}"
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
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
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
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
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
num_of_cpus = 0
core_id[0]
processor_id[0]
cpu_id[0]
type = "-"
iter = 0
(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
(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/ {
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
processor_id[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
}
# array of physical cpus ids
/^physical/ {
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
cpu_id[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
}
# array of core ids
/^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
core_id[iter] = $NF
iter++
(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 ##
for ( i in processor_id ) {
procHolder[processor_id[i]] = 1
}
for ( i in procHolder ) {
num_of_processors++
}
i = 0
## count unique physical cpus ##
for ( i in cpu_id ) {
cpuHolder[cpu_id[i]] = 1
}
for ( i in cpuHolder ) {
num_of_cpus++
more indentation cleanup
2009-01-06 22:22:56 +00:00
}
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
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
i = 0
## count unique cores ##
for ( i in core_id ) {
coreHolder[core_id[i]] = 1
(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
}
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
for ( i in coreHolder ) {
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
}
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)
if ( num_of_processors > 1 )
{
Bugfix to cpu logic
2010-07-24 23:49:55 +00:00
# non-multicore HT
if ( num_of_processors == (num_of_cores * 2))
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
{
type = 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
}
Bugfix to cpu logic
2010-07-24 23:49:55 +00:00
# non-HT multi-core or HT multi-core
if (( num_of_processors == num_of_cores) ||
( num_of_cpus < num_of_cores))
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
{
type = 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
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
if ( num_of_cpus > 1 )
{
type = type "SMP-"
more indentation cleanup
2009-01-06 22:22:56 +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
} else {
type = type "UP-"
}
print type " " num_of_cpus " " num_of_cores
more indentation cleanup
2009-01-06 22:22:56 +00:00
}
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
' $FILE_CPUINFO
) )
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
fi
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "A_CPU_TYPE_PCNT_CCNT: ${A_CPU_TYPE_PCNT_CCNT[@]}"
eval $LOGFE
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +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
# Detect desktop environment in use, logic from: compiz-check
# http://forlong.blogage.de/entries/pages/Compiz-Check
detect_desktop_environment()
{
eval $LOGFS
# set the default, this function only runs in X, if null, don't print data out
changed toolkit to show only with -xS, that's not that important.
2011-05-20 05:24:57 +00:00
local desktop_environment='' xprop_root='' ps_aux=''
added kde version, and qt version, output
2011-05-19 05:03:14 +00:00
local version='' version_data='' toolkit=''
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
# note, GNOME_DESKTOP_SESSION_ID is deprecated so we'll see how that works out
# https://bugzilla.gnome.org/show_bug.cgi?id=542880
cleaned up code a bit
2011-05-19 06:53:57 +00:00
if [[ -n $GNOME_DESKTOP_SESSION_ID ]]; then
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
version=$( get_de_version 'gnome-about' 'gnome' '3' )
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
# this is a hack, and has to be changed with every toolkit version change
toolkit=$( pkg-config --modversion gtk+-3.0 2>/dev/null )
if [[ -z $toolkit ]];then
toolkit=$( pkg-config --modversion gtk+-2.0 2>/dev/null )
fi
if [[ -n $toolkit ]];then
version="$version (Gtk: $toolkit)"
fi
got gnome version/gtk version
2011-05-19 05:30:55 +00:00
fi
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment="Gnome"
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
# assume 5 will id the same, why not, no need to update in future
elif [[ $KDE_SESSION_VERSION == '5' ]]; then
added kde version, and qt version, output
2011-05-19 05:03:14 +00:00
version_data=$( kded5 --version 2>/dev/null )
version=$( grep -si '^KDE Development Platform:' <<< "$version_data" | gawk '{print $4}' )
if [[ -z $version ]];then
version='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"
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
elif [[ $KDE_SESSION_VERSION == '4' ]]; then
added kde version, and qt version, output
2011-05-19 05:03:14 +00:00
version_data=$( kded4 --version 2>/dev/null )
version=$( grep -si '^KDE Development Platform:' <<< "$version_data" | gawk '{print $4}' )
if [[ -z $version ]];then
version='4'
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}' )
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
# version=$( get_de_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"
refactored desktop detections to avoid repeated code
2011-05-21 22:19:36 +00:00
# now that the primary ones have been handled, next is to find the ones with unique
# xprop detections possible
bug fix
2011-05-19 06:58:31 +00:00
else
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
ps_aux="$( ps aux )"
bug fix
2011-05-19 06:58:31 +00:00
if [[ -n $( type -p xprop ) ]];then
xprop_root="$( xprop -root 2>/dev/null )"
refactored desktop detections to avoid repeated code
2011-05-21 22:19:36 +00:00
# String: "This is xfdesktop version 4.2.12"
bug fix
2011-05-19 06:58:31 +00:00
if [[ -n $( grep -Eis '\"xfce4\"' <<< "$xprop_root" ) ]];then
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
version=$( get_de_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' )
refactored desktop detections to avoid repeated code
2011-05-21 22:19:36 +00:00
if [[ -z $version ]];then
fixed bugs
2011-05-21 22:46:13 +00:00
version='4'
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
else
if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( get_de_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' )
if [[ -n $toolkit ]];then
output tweak
2011-05-21 22:59:56 +00:00
version="$version (Gtk+ $toolkit)"
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
fi
fi
more version info for other desktops
2011-05-19 05:52:08 +00:00
fi
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment="Xfce"
refactored desktop detections to avoid repeated code
2011-05-21 22:19:36 +00:00
# when 5 is released, the string may need updating
bug fix
2011-05-19 06:58:31 +00:00
elif [[ -n $( grep -is '\"xfce5\"' <<< "$xprop_root" ) ]];then
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
version=$( get_de_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' )
refactored desktop detections to avoid repeated code
2011-05-21 22:19:36 +00:00
if [[ -z $version ]];then
fixed bugs
2011-05-21 22:46:13 +00:00
version='5'
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
else
if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( get_de_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' )
if [[ -n $toolkit ]];then
output tweak
2011-05-21 22:59:56 +00:00
version="$version (Gtk+ $toolkit)"
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
fi
fi
more version info for other desktops
2011-05-19 05:52:08 +00:00
fi
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment="Xfce"
bug fix
2011-05-19 06:58:31 +00:00
elif [[ -n $( grep -is 'BLACKBOX_PID' <<< "$xprop_root" ) ]];then
if [[ -n $( grep -is 'fluxbox' <<< "$ps_aux" | grep -v 'grep' ) ]];then
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
version=$( get_de_version 'fluxbox' 'fluxbox[[:space:]]([[:digit:]]|GIT)' '2' )
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment='Fluxbox'
bug fix
2011-05-19 06:58:31 +00:00
else
desktop_environment='Blackbox'
fi
elif [[ -n $( grep -is 'OPENBOX_PID' <<< "$xprop_root" ) ]];then
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
version=$( get_de_version 'openbox' 'openbox[[:space:]]([[:digit:]]|GIT)' '2' )
bug fix
2011-05-19 06:58:31 +00:00
if [[ -n $( grep -is 'lxde' <<< "$ps_aux" | grep -v 'grep' ) ]];then
if [[ -n $version ]];then
refactored desktop detections to avoid repeated code
2011-05-21 22:19:36 +00:00
version=" (Openbox$version)"
bug fix
2011-05-19 06:58:31 +00:00
fi
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment='LXDE'
bug fix
2011-05-19 06:58:31 +00:00
else
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment='Openbox'
bug fix
2011-05-19 06:58:31 +00:00
fi
elif [[ -n $( grep -is 'ICEWM' <<< "$xprop_root" ) ]];then
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
version=$( get_de_version 'icewm' 'icewm[[:space:]]([[:digit:]]|GIT)' '2' )
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment='IceWM'
more version info for other desktops
2011-05-19 05:52:08 +00:00
fi
bug fix
2011-05-19 07:01:32 +00:00
fi
bug fix
2011-05-19 06:58:31 +00:00
# a few manual hacks for things that don't id with xprop, these are just good guesses
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
bug fix
2011-05-19 06:58:31 +00:00
if [[ -n $( grep -is 'fvwm-crystal' <<< "$ps_aux" | grep -v 'grep' ) ]];then
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
version=$( get_de_version 'fvwm' 'fvwm[[:space:]]([[:digit:]]|GIT)' '2' )
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment='FVWM-Crystal'
bug fix
2011-05-19 06:58:31 +00:00
elif [[ -n $( grep -is 'fvwm' <<< "$ps_aux" | grep -v 'grep' ) ]];then
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
version=$( get_de_version 'fvwm' 'fvwm[[:space:]]([[:digit:]]|GIT)' '2' )
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment='FVWM'
bug fix
2011-05-19 06:58:31 +00:00
elif [[ -n $( grep -is 'pekwm' <<< "$ps_aux" | grep -v 'grep' ) ]];then
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
version=$( get_de_version 'pekwm' 'pekwm.*([[:digit:]]|GIT)' '3' )
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment='pekwm'
bug fix
2011-05-19 06:58:31 +00:00
elif [[ -n $( grep -is 'awesome' <<< "$ps_aux" | grep -v 'grep' ) ]];then
added xfce built with toolkit
2011-05-21 22:54:02 +00:00
version=$( get_de_version 'awesome' 'awesome' '2' )
fixed bugs
2011-05-21 22:46:13 +00:00
desktop_environment='Awesome'
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
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
refactored desktop detections to avoid repeated code
2011-05-21 22:19:36 +00:00
# args: $1 - desktop command for --version; $2 - search string; $3 - gawk print number
get_de_version()
{
local version=''
version=$( $1 --version 2>/dev/null | gawk '
BEGIN {
IGNORECASE=1
}
tweaks
2011-05-21 22:25:40 +00:00
/'$2'/ {
comments
2011-05-21 22:47:57 +00:00
gsub(",","",$0) # xfce output has , in it, so dump all commas
refactored desktop detections to avoid repeated code
2011-05-21 22:19:36 +00:00
print $'$3'
comments
2011-05-21 23:17:23 +00:00
exit # quit after first match prints
refactored desktop detections to avoid repeated code
2011-05-21 22:19:36 +00:00
}' )
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
}
(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
lsb fix for distros with known good lsb files
2008-12-20 18:52:54 +00:00
local i='' j='' distro='' distro_file='' a_distro_glob=''
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
a_distro_glob=(*[-_]{release,version})
cd "$OLDPWD"
shopt -u nullglob
if [[ ${#a_distro_glob[@]} -eq 1 ]];then
distro_file="${a_distro_glob}"
# 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
# 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
##
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +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'
else
distro_file="${i}"
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
distro="$( egrep -oi 'antix.*\.iso' <<< $( remove_erroneous_chars '/etc/antiX' ) | sed 's/\.iso//' )"
# 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.
(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
elif [[ -n $distro_file && -f $FILE_LSB_RELEASE && " $DISTROS_LSB_GOOD" == *" $distro_file "* ]];then
updated trunk inxi
2009-05-28 20:26:29 +00:00
distro=$( get_distro_lsb_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
elif [[ $distro_file == 'lsb-release' ]];then
distro=$( get_distro_lsb_data )
# 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
distro=$( remove_erroneous_chars "/etc/$distro_file" )
# 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
(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
distro=$( get_distro_lsb_data )
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 )
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
(Change Version) Added fall through /etc/lsb-release test to update distro data tests. This adds one more failsafe test to future proof the stuff against id failures. I tried to also use the standard lsb_release function but for some reason when it's run inside inxi and sent to awk it gets incredibly slowed down. This is odd, since that command usually runs quite fast in shell. But it's too slow as is for now to use, it makes everything hang. Maybe later I'll add an option to trigger it or something.
2008-11-11 01:05:55 +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 [[ ${#distro} -gt 80 ]] && [[ $B_HANDLE_CORRUPT_DATA != 'true' ]];then
(Change Version) Added fall through /etc/lsb-release test to update distro data tests. This adds one more failsafe test to future proof the stuff against id failures. I tried to also use the standard lsb_release function but for some reason when it's run inside inxi and sent to awk it gets incredibly slowed down. This is odd, since that command usually runs quite fast in shell. But it's too slow as is for now to use, it makes everything hang. Maybe later I'll add an option to trigger it or something.
2008-11-11 01:05:55 +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
(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
distro=$( get_distro_lsb_data )
fi
## finally, if all else has failed, give up
if [[ -z $distro ]];then
distro='Unknown distro o_O'
fi
# this handles an arch bug where /etc/arch-release is empty and /etc/issue is corrupted
if [[ -n $( grep -i 'arch linux' <<< $distro ) ]];then
distro='Arch Linux'
fi
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
}
(No Version Change) Tweaked get distro lsb data a bit to avoid confusion in the future, but no change to handling.
2008-11-11 03:15:27 +00:00
# args: $1 - optional, app, uses the app test, not being used now
(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_distro_lsb_data()
{
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=''
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
if [[ $B_LSB_FILE == 'true' ]] && [[ $1 != 'app' ]];then
(Change Version) Added fall through /etc/lsb-release test to update distro data tests. This adds one more failsafe test to future proof the stuff against id failures. I tried to also use the standard lsb_release function but for some reason when it's run inside inxi and sent to awk it gets incredibly slowed down. This is odd, since that command usually runs quite fast in shell. But it's too slow as is for now to use, it makes everything hang. Maybe later I'll add an option to trigger it or something.
2008-11-11 01:05:55 +00:00
distro=$( 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) This should be about it, some fine tuning of variables, distro id handling, and lsb file handling
2008-11-11 20:01:36 +00:00
# note: adding the spacing directly to variable to make sure distro output is null if not found
(Change Version) Added fall through /etc/lsb-release test to update distro data tests. This adds one more failsafe test to future proof the stuff against id failures. I tried to also use the standard lsb_release function but for some reason when it's run inside inxi and sent to awk it gets incredibly slowed down. This is odd, since that command usually runs quite fast in shell. But it's too slow as is for now to use, it makes everything hang. Maybe later I'll add an option to trigger it or something.
2008-11-11 01:05:55 +00:00
/^DISTRIB_ID/ {
gsub(/^ +| +$/, "", $NF)
(Change Version) This should be about it, some fine tuning of variables, distro id handling, and lsb file handling
2008-11-11 20:01:36 +00:00
# this is needed because grep for "arch" is too loose to be safe
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
if ( $NF == "arch" ) {
(Change Version) This should be about it, some fine tuning of variables, distro id handling, and lsb file handling
2008-11-11 20:01:36 +00:00
distroId = "Arch Linux"
}
else if ( $NF != "n/a" ) {
distroId = $NF " "
}
(Change Version) Added fall through /etc/lsb-release test to update distro data tests. This adds one more failsafe test to future proof the stuff against id failures. I tried to also use the standard lsb_release function but for some reason when it's run inside inxi and sent to awk it gets incredibly slowed down. This is odd, since that command usually runs quite fast in shell. But it's too slow as is for now to use, it makes everything hang. Maybe later I'll add an option to trigger it or something.
2008-11-11 01:05:55 +00:00
}
/^DISTRIB_RELEASE/ {
gsub(/^ +| +$/, "", $NF)
(Change Version) This should be about it, some fine tuning of variables, distro id handling, and lsb file handling
2008-11-11 20:01:36 +00:00
if ( $NF != "n/a" ) {
distroRelease = $NF " "
}
(Change Version) Added fall through /etc/lsb-release test to update distro data tests. This adds one more failsafe test to future proof the stuff against id failures. I tried to also use the standard lsb_release function but for some reason when it's run inside inxi and sent to awk it gets incredibly slowed down. This is odd, since that command usually runs quite fast in shell. But it's too slow as is for now to use, it makes everything hang. Maybe later I'll add an option to trigger it or something.
2008-11-11 01:05:55 +00:00
}
/^DISTRIB_CODENAME/ {
gsub(/^ +| +$/, "", $NF)
(Change Version) This should be about it, some fine tuning of variables, distro id handling, and lsb file handling
2008-11-11 20:01:36 +00:00
if ( $NF != "n/a" ) {
distroCodename = $NF " "
}
(Change Version) Added fall through /etc/lsb-release test to update distro data tests. This adds one more failsafe test to future proof the stuff against id failures. I tried to also use the standard lsb_release function but for some reason when it's run inside inxi and sent to awk it gets incredibly slowed down. This is odd, since that command usually runs quite fast in shell. But it's too slow as is for now to use, it makes everything hang. Maybe later I'll add an option to trigger it or something.
2008-11-11 01:05:55 +00:00
}
small fix in distro id to handle incorrectly arch linux /etc/lsb-release file. Normally we won't fix such things, which are just bugs in the distro, but in this case, since there's now an overall failsafe, that can be used for all future distros that might make the same mistake. But please, tighten up your standards distro, this is a small file, and it's not hard to fill it out right, is it? Or is it?
2010-09-30 00:46:02 +00:00
# sometimes some distros cannot do their lsb-release files correctly, so here is
# one last chance to get it right.
/^DISTRIB_DESCRIPTION/ {
gsub(/^ +| +$/, "", $0)
if ( $NF != "n/a" ) {
# slice out the part inside "", like: DISTRIB_DESCRIPTION="Arch Linux"
gsub(/DISTRIB_DESCRIPTION=|"/,"",$0)
distroDescription = $0
}
}
(Change Version) Added fall through /etc/lsb-release test to update distro data tests. This adds one more failsafe test to future proof the stuff against id failures. I tried to also use the standard lsb_release function but for some reason when it's run inside inxi and sent to awk it gets incredibly slowed down. This is odd, since that command usually runs quite fast in shell. But it's too slow as is for now to use, it makes everything hang. Maybe later I'll add an option to trigger it or something.
2008-11-11 01:05:55 +00:00
END {
small fix in distro id to handle incorrectly arch linux /etc/lsb-release file. Normally we won't fix such things, which are just bugs in the distro, but in this case, since there's now an overall failsafe, that can be used for all future distros that might make the same mistake. But please, tighten up your standards distro, this is a small file, and it's not hard to fill it out right, is it? Or is it?
2010-09-30 00:46:02 +00:00
fullString=""
if ( distroId == "" && distroRelease == "" && distroCodename == "" && distroDescription != "" ){
fullString = distroDescription
}
else {
fullString = distroId distroRelease distroCodename
}
print fullString
}
' $FILE_LSB_RELEASE )
(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_LSB_RELEASE"
(No Version Change) Tweaked get distro lsb data a bit to avoid confusion in the future, but no change to handling.
2008-11-11 03:15:27 +00:00
fi
(Change Version) Added fall through /etc/lsb-release test to update distro data tests. This adds one more failsafe test to future proof the stuff against id failures. I tried to also use the standard lsb_release function but for some reason when it's run inside inxi and sent to awk it gets incredibly slowed down. This is odd, since that command usually runs quite fast in shell. But it's too slow as is for now to use, it makes everything hang. Maybe later I'll add an option to trigger it or something.
2008-11-11 01:05:55 +00:00
# this is HORRIBLY slow, but I don't know why, it runs fast in shell
(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 $( type -p lsb_release ) && $1 == 'app' ]];then
(Change Version) Added fall through /etc/lsb-release test to update distro data tests. This adds one more failsafe test to future proof the stuff against id failures. I tried to also use the standard lsb_release function but for some reason when it's run inside inxi and sent to awk it gets incredibly slowed down. This is odd, since that command usually runs quite fast in shell. But it's too slow as is for now to use, it makes everything hang. Maybe later I'll add an option to trigger it or something.
2008-11-11 01:05:55 +00:00
# distro=$( echo "$( lsb_release -irc )" | gawk '
# { IGNORECASE=1 }
# /^Distributor ID/ {
# gsub(/^ +| +$/, "", $NF)
# distroId = $NF
# }
# /^Release/ {
# gsub(/^ +| +$/, "", $NF)
# distroRelease = $NF
# }
# /^Codename/ {
# gsub(/^ +| +$/, "", $NF)
# distroCodename = $NF
# }
# END {
# print distroId " " distroRelease " (" distroCodename ")"
# }' )
(No Version Change) Tweaked get distro lsb data a bit to avoid confusion in the future, but no change to handling.
2008-11-11 03:15:27 +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) 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
(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
if [[ -n $( type -p nvidia-settings ) ]];then
(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
# first get the number of screens
screens=$( nvidia-settings -q screens | gawk '
/:[0-9]\.[0-9]/ {
bug fix for multiple gpu output
2009-11-16 22:46:52 +00:00
screens=screens gensub(/(.*)(:[0-9]\.[0-9])(.*)/, "\\2", "1", $0) " "
bug fix, handled case of multiple gpus and temps
2009-08-03 08:21:11 +00:00
}
END {
(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
print screens
}
' )
# 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
gpu_temp_looper=$( nvidia-settings -c $screen_nu -q GPUCoreTemp | gawk -F ': ' '
BEGIN {
IGNORECASE=1
gpuTemp=""
gpuTempWorking=""
}
/Attribute (.*)[0-9]+\.$/ {
gsub(/\./, "", $2)
if ( $2 ~ /^[0-9]+$/ ) {
gpuTemp=gpuTemp $2 "C "
}
}
END {
print gpuTemp
}'
)
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
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
elif [[ -n $( type -p aticonfig ) ]];then
# 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
(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
}
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
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
local 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
IFS=$'\n'
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
A_GFX_CARD_DATA=( $( echo "$Lspci_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
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
nic=""
(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
}
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
/vga compatible controller/ {
gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF)
gsub(/,/, " ", $NF)
gsub(/^ +| +$/, "", $NF)
gsub(/ [ \t]+/, " ", $NF)
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
nic=gensub(/^([0-9a-f:\.]+) (.+)$/,"\\1","",$1)
print $NF "," nic
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"
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
# for (( i=0; i < ${#A_GFX_CARD_DATA[@]}; i++ ))
# do
# A_GFX_CARD_DATA[i]=$( sanitize_characters BAN_LIST_NORMAL "${A_GFX_CARD_DATA[i]}" )
# 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..
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
# GFXMEM="size=[$(echo "$Lspci_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]"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "A_GFX_CARD_DATA: ${A_GFX_CARD_DATA[@]}"
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
## 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
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_SHOW_X_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/ {
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] / ) {
gsub(/'"$BAN_LIST_NORMAL"'/, "", $2)
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
}
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/ {
(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
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "A_GLX_DATA: ${A_GLX_DATA[@]}"
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
added handling for multiple res for multiple screens in special cases with multiple video cards
2010-10-08 06:05:34 +00:00
local screen_resolution='' xdpy_data='' screens_count=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
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_SHOW_X_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
(no version change) Some code clean up, got rid of a few more awk one liners, and added back in the local variable.
2009-03-17 00:09:52 +00:00
screen_resolution=$( stty -F $( readlink /proc/$PPID/fd/0 ) size | gawk '{
print $2"x"$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
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
}
## for possible future data, not currently used
get_graphics_agp_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
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
local agp_module=''
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
some code cleanup and variable naming fixes
2010-01-09 04:49:55 +00:00
if [[ $B_MODULES_FILE == '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
## not used currently
(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
agp_module=$( gawk '
/agp/ && !/agpgart/ && $3 > 0 {
print(gensub(/(.*)_agp.*/,"\\1","g",$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
}' $FILE_MODULES )
log_function_data 'cat' "$FILE_MODULES"
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 logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "agp_module: $agp_module"
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
## create array of x vendor/version 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_x_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
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
local x_vendor='' x_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
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_SHOW_X_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.
x_vendor=$( 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
}
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)
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
print $2
Cleaned up more awk one liner flow controls, removed ; and added new lines, please check to make sure I didn't mess up!
2008-11-05 23:54:14 +00:00
}' )
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
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 method added since radeon and X.org and the disappearance of <X server name> version : ...etc
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
# Later on, the normal textual version string returned, e.g. like: X.Org version: 6.8.2
# A failover mechanism is in place. (if $x_version is empty, the release number is parsed instead)
(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
x_version=$( xdpyinfo | gawk '
/version:/ {
(no version change) Some code clean up, got rid of a few more awk one liners, and added back in the local variable.
2009-03-17 00:09:52 +00:00
print $NF
}' )
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
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 $x_version ]];then
added in out of X, root support for showing X.org version
2010-08-24 21:27:47 +00:00
x_version=$( get_x_version )
fi
if [[ -z $x_version ]];then
x_version=$( 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
}
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 release number/ {
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(/0+$/, "", $2)
gsub(/0+/, ".", $2)
print $2
Made all awk code endings the same, }' )... in all cases, or }' /file/path, or whatever
2008-11-06 21:39:18 +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
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
if [[ -z $( grep -E '(X|xorg|x\.org)' <<< $x_vendor ) ]];then
x_vendor="$x_vendor X.org"
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
A_X_DATA[0]="$x_vendor"
A_X_DATA[1]="$x_version"
added in out of X, root support for showing X.org version
2010-08-24 21:27:47 +00:00
else
x_version=$( get_x_version )
if [[ -n $x_version ]];then
x_vendor='X.org'
A_X_DATA[0]="$x_vendor"
A_X_DATA[1]="$x_version"
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
log_function_data "A_X_DATA: ${A_X_DATA[@]}"
eval $LOGFE
refactored into primary data get and print functions
2008-10-28 04:14:35 +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
get_x_version()
{
eval $LOGFS
local x_exists=$( type -p X )
local x_version=''
if [[ -n $x_exists ]];then
# note: MUST be this syntax: X -version 2>&1
# otherwise X -version overrides everything and this comes out null.
# two knowns id strings: X.Org X Server 1.7.5 AND Window System Version 1.7.5
#X -version 2>&1 | gawk '/^X Window System Version/ { print $5 }'
x_version=$( X -version 2>&1 | gawk '
BEGIN {
IGNORECASE=1
}
/x.org x server|X Window System Version/ {
print $NF
}' )
fi
echo $x_version
log_function_data " x_version: $x_version"
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
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
local hdd_used=''
added in another ignore fs, devtempfs
2010-09-16 19:00:57 +00:00
local hdd_data="$( df --exclude-type=aufs --exclude-type=squashfs --exclude-type=unionfs --exclude-type=devtmpfs --exclude-type=tmpfs --exclude-type=iso9660 )"
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"
hdd_used=$( echo "$hdd_data" | gawk '
Fixed a hard disk percent used bug, needed to add /dev/dm-<number> to pattern
2009-02-12 05:22:12 +00:00
# also handles odd dm-1 type, from lvm
added support for virtual disks, like /dev/vda3 for partitions / disks
2011-04-21 01:16:09 +00:00
/^\/dev\/(mapper\/|[hsv]d[a-z][0-9]+|dm[-]?[0-9]+)/ {
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
# it to the next line for that single case
(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 ( NF < 5 && $0 !~ /.*\%/ ) {
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.
fixed bug with space in user partition names in hard disk size
2009-01-09 02:24:25 +00:00
if ( $4 ~ /.*\%/ ) {
used += $2
}
# otherwise use standard
else if ( $5 ~ /.*\%/ ) {
used += $3
}
# 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 support for virtual disks, like /dev/vda3 for partitions / disks
2011-04-21 01:16:09 +00:00
$1 ~ /^(3|22|33|8)$/ && $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
}
(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_PARTITIONS ) )
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"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "A_HDD_DATA: ${A_HDD_DATA[@]}"
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=''
(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
local sd_ls_by_id='' ls_disk_by_id='' usb_exists=''
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
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 [[ -n $( egrep 'hd[a-z]' <<< ${A_HDD_DATA[@]} ) ]];then
# 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"
if [[ -n $( egrep '^hd[a-z]' <<< ${a_temp_working[0]} ) ]];then
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.
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 [[ -n $( egrep '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...
ls_disk_by_id="$( ls -l /dev/disk/by-id )"
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
if [[ -n $( egrep '^sd[a-z]' <<< ${A_HDD_DATA[$i]} ) ]];then
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 )
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
sd_ls_by_id=$( egrep -m1 ".*$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
usb_exists=$( egrep -m1 "usb-.*$temp_name.*${a_temp_working[0]}$" <<< "$ls_disk_by_id" )
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
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "A_HDD_DATA: ${A_HDD_DATA[@]}"
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
(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 )
(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
if [[ -n $hdd_temp && -n $( grep -E '^([0-9]+)$' <<< $hdd_temp ) ]];then
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
}
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
local lspci_data="$( lspci -v | gawk '{
cleanup
2008-11-06 21:18:11 +00:00
gsub(/\(prog-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
print
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
}' )"
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
echo "$lspci_data"
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' "lspci_data:\n$lspci_data"
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
}
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
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
local memory=''
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 {
used = tot-notused
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"
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
fine tuning, get rid of extra grep in loop
2011-05-01 16:42:33 +00:00
local b_usb_networking='false' id_string=''
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'
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
A_NETWORK_DATA=( $( echo "$Lspci_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
}
refactored into primary data get and print functions
2008-10-28 04:14:35 +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)
refactored into primary data get and print functions
2008-10-28 04:14:35 +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=""
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++
}
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"
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +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
# 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 :)
lsusb_data="$( $lsusb_path 2>/dev/null )"
for needle in $USB_NETWORK_SEARCH
do
fine tuning, get rid of extra grep in loop
2011-05-01 16:42:33 +00:00
id_string=$( grep -isE "$needle" <<< "$lsusb_data" | grep -Eisv '(bluetooth| hub|keyboard|mouse|printer| ps2|reader|scan|storage)' )
if [[ -n $id_string ]];then
card_data=$id_string
added break to the loop now that it's getting so long for usb network, at this point only supporing a single usb network device, have to draw a line at fringes I think.
2011-04-30 22:54:42 +00:00
break
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
fi
done
log_function_data 'raw' "lsusb_data:\n$lsusb_data\ncard_data:$card_data"
if [[ -n $card_data ]];then
array_string=$( gawk '
BEGIN {
IGNORECASE=1
string=""
separator=""
}
{
gsub( /,/, " ", $0 )
gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
synched audio output to use usb id as well if -x runs
2011-04-30 23:10:06 +00:00
gsub(/ [ \t]+/, " ", $0)
added card type
2011-04-30 06:45:56 +00:00
gsub(/realtek semiconductor/, "Realtek", $0)
gsub(/davicom semiconductor/, "Davicom", $0)
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
for ( i=7; i<= NF; i++ ) {
string = string separator $i
separator = " "
}
if ( $6 != "" ){
print string ",,,,usb-" $6
}
}' <<< "$card_data" )
bug fix?
2011-04-30 07:17:23 +00:00
maybe bug fix
2011-04-30 07:15:03 +00:00
if [[ -n $array_string ]];then
final bug fix, whew!!
2011-04-30 07:38:23 +00:00
array_count=${#A_NETWORK_DATA[@]}
trying another
2011-04-30 07:24:21 +00:00
IFS=","
maybe bug fix
2011-04-30 07:15:03 +00:00
A_NETWORK_DATA[$array_count]="$array_string"
bug fix?
2011-04-30 07:17:23 +00:00
IFS="$ORIGINAL_IFS"
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
# need this to get the driver data for -N regular output, but no need
# to run the advanced stuff unless required
b_usb_networking='true'
maybe bug fix
2011-04-30 07:15:03 +00:00
fi
bug fix?
2011-04-30 07:17:23 +00:00
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
fi
fi
maybe bug fix
2011-04-30 07:15:03 +00:00
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
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
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "A_NETWORK_DATA: ${A_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
}
get_network_advanced_data()
{
eval $LOGFS
new version, with usb networking driver output now
2011-04-30 08:06:01 +00:00
local a_network_adv_working='' if_path='' working_path='' dir_path=''
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
local if_id='' speed='' duplex='' mac_id='' oper_state=''
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=''
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
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
working_path="/sys/bus/pci/devices/0000:${a_network_adv_working[4]}"
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
else
add back in test
2011-04-30 06:29:23 +00:00
# slice off the usb- part
bug fix
2011-04-30 06:28:22 +00:00
usb_data=$( cut -d '-' -f 2-4 <<< ${a_network_adv_working[4]} )
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
bug fix
2011-04-30 06:23:07 +00:00
dir_path=$( ls ${working_path} 2>/dev/null | grep -sE '^[0-9]' )
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
working_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
driver_test=$( grep -si 'DRIVER=' $working_path/uevent | cut -d '=' -f 2 )
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
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +00:00
if [[ -e $working_path/net ]];then
if_path=$( ls $working_path/net 2>/dev/null )
if_id=$if_path
working_path=$working_path/net/$if_path
# 2.6.32 debian lenny kernel shows not: /net/eth0 but /net:eth0
else
if_path=$( ls $working_path 2>/dev/null | grep 'net:' )
if_id=$( cut -d ':' -f 2 <<< "$if_path" )
working_path=$working_path/$if_path
fi
if [[ -n $if_path ]];then
if [[ -f $working_path/speed ]];then
speed=$( cat $working_path/speed )
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
if [[ -f $working_path/duplex ]];then
duplex=$( cat $working_path/duplex )
fi
if [[ -f $working_path/address ]];then
mac_id=$( cat $working_path/address )
fi
if [[ -f $working_path/operstate ]];then
oper_state=$( cat $working_path/operstate )
fi
fi
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
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
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
(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=''
(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
# get ip using wget redirect to stdout. This is a clean, text only IP output url.
updated trunk inxi
2009-05-28 20:26:29 +00:00
ip=$( wget -q -O - http://smxi.org/opt/ip.php | gawk -F 'is: ' '{
(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")
print $2
}' )
if [[ -z $ip ]];then
ip='None Detected!'
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
local ifconfig_path=$( type -p ifconfig )
# lack of ifconfig will throw an error only upon it's usage
if [[ -n $ifconfig_path ]];then
(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=$'\n'
(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
A_INTERFACES_DATA=( $( $ifconfig_path | 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
}
(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
$0 !~ /^lo/ {
# not clear on why inet is coming through, but this gets rid of it
# as first line item.
interface = $1
gsub(/,/, " ", interface)
gsub(/^ +| +$/, "", interface)
gsub(/ [ \t]+/, " ", interface)
aInterfaces[interface]++
while (getline && !/^$/) {
if (/inet addr:/) {
ipAddresses[interface] = gensub( /addr:([0-9\.]+)/, "\\1", "g", $2 )
}
}
}
END {
j=0
for (i in aInterfaces) {
useInterfaceIp = ""
a[j] = i
if (ipAddresses[i] != "") {
useInterfaceIp = ipAddresses[i]
}
# 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
if ( useInterfaceIp != "" ) {
print a[j] "," useInterfaceIp
}
j++
}
}') )
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
A_INTERFACES_DATA=( "Interfaces tool requires missing app: ifconfig" )
(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
log_function_data "A_INTERFACES_DATA: ${A_INTERFACES_DATA[@]}"
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
}
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
local a_partition_working='' dev_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
local main_partition_data="$( df -h -T --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 )"
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
local swap_data="$( swapon -s )"
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
get_partition_uuid_label_data 'label'
get_partition_uuid_label_data 'uuid'
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"
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
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
A_PARTITION_DATA=( $( echo "$main_partition_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
}
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=""
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.
small tweak to logic of partitions
2009-10-14 23:09:30 +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
(no version change, but update) Added wrapped mount point output
2009-03-02 02:15:06 +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
}
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
( $1 ~ /^\/dev\// ) && ( devBase == "" ) {
devBase=gensub( /^(\/dev\/)(.+)$/, "\\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$/ {
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",main," $(NF - 5) "," 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
(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
if ( $(NF - 1) ~ /[0-9]+\%/ ) {
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",secondary," $(NF - 5) "," 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
else if ( $(NF - 2) ~ /[0-9]+\%/ ) {
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
print $(NF - 1) " " $NF "," $(NF - 5) "," $(NF - 4) "," $(NF - 2) ",secondary," $(NF - 6) "," 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
}
else if ( $(NF - 3) ~ /[0-9]+\%/ ) {
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
print $(NF - 2) " " $(NF - 1) " " $NF "," $(NF - 6) "," $(NF - 5) "," $(NF - 3) ",secondary," $(NF - 7) "," 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
}
(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
}
' )
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
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
$( echo "$swap_data" | gawk '
(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
}
/^\/dev/ {
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
size = sprintf( "%.2f", $3*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 )
(change version) New feature in swap partition data: show percent used, this is a damentz patch
2009-03-02 00:52:09 +00:00
used = sprintf( "%.2f", $4*1024/1000**3 )
percentUsed = sprintf( "%.0f", ( $4/$3 )*100 )
(change version) added partition fs type output
2009-10-10 03:50:32 +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
# 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"
reset variable in a loop to avoid error
2010-09-16 21:19:50 +00:00
dev_item='' # reset each loop
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
if [[ -n $( grep -E '(by-uuid|by-label)' <<< ${a_partition_working[6]} ) ]];then
if [[ -n $DEV_DISK_UUID ]];then
dev_item=$( echo "$DEV_DISK_UUID" | gawk '
the 4.1.16 bug fix recreated the 1.4.15 bug fix issue, that is now corrected.
2010-09-29 16:36:24 +00:00
/'$( basename ${a_partition_working[6]} )'/ {
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
}' )
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 '
the 4.1.16 bug fix recreated the 1.4.15 bug fix issue, that is now corrected.
2010-09-29 16:36:24 +00:00
/'$( basename ${a_partition_working[6]} )'/ {
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
}' )
fi
if [[ -n $dev_item ]];then
# 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]}","$dev_item
IFS="$ORIGINAL_IFS"
fi
fi
done
(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
(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
log_function_data "A_PARTITION_DATA: ${A_PARTITION_DATA[@]}"
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=''
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
local dev_item='' dev_label='' dev_uuid=''
local variables added to cleanup
2009-02-05 02:12:18 +00:00
local mount_point=''
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
get_partition_uuid_label_data 'label'
get_partition_uuid_label_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
(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
(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"
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
dev_item=${a_partition_working[6]}
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
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 ]] && [[ -z $dev_item && -n $dev_uuid ]];then
dev_item=$( echo "$DEV_DISK_UUID" | gawk '
(change version) bug fix, now it should work for all uuid/label
2009-02-07 08:09:00 +00:00
/'$dev_uuid'/ {
(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
item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
print 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
elif [[ -n $DEV_DISK_LABEL ]] && [[ -z $dev_item && -n $dev_label ]];then
dev_item=$( echo "$DEV_DISK_LABEL" | gawk '
trying to handle weird space in name case
2009-02-26 17:15:09 +00:00
# first we need to change space x20 in by-label back to a real space
didn't workO
2009-02-26 17:17:12 +00:00
#gsub( /x20/, " ", $0 )
trying to handle weird space in name case
2009-02-26 17:15:09 +00:00
# then we can see if the string is there
(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
/'$dev_label'/ {
item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
print item
}' )
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
if [[ -n $DEV_DISK_UUID ]] && [[ -n $dev_item && -z $dev_uuid ]];then
dev_uuid=$( echo "$DEV_DISK_UUID" | gawk '
bug fix for label/uuid for root, that was trickier than I realized
2009-02-07 07:48:35 +00:00
/'$dev_item'$/ {
print $(NF - 2)
}' )
bug fixes
2009-02-07 07:51:09 +00:00
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
if [[ -n $DEV_DISK_LABEL ]] && [[ -n $dev_item && -z $dev_label ]];then
dev_label=$( echo "$DEV_DISK_LABEL" | gawk '
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
/'$dev_item'$/ {
(change version) bug fix, now it should work for all uuid/label
2009-02-07 08:09:00 +00:00
print $(NF - 2)
bug fix for label/uuid for root, that was trickier than I realized
2009-02-07 07:48:35 +00:00
}' )
(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"
(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
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
log_function_data "A_PARTITION_DATA: ${A_PARTITION_DATA[@]}"
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
}
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
# args: $1 - uuid/label
get_partition_uuid_label_data()
{
eval $LOGFS
# only run these tests once per directory to avoid excessive queries to fs
case $1 in
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
;;
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
;;
esac
log_function_data 'raw' "DEV_DISK_LABEL:\n$DEV_DISK_LABEL\n\nDEV_DISK_UUID:\n$DEV_DISK_UUID"
# debugging section, uncomment to insert user data
# DEV_DISK_LABEL='
#
# '
# DEV_DISK_UUID='
#
# '
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
(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
get_ps_data()
{
eval $LOGFS
(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
local array_length='' reorder_temp='' i=0 head_tail='' sort_type=''
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)
bug fix, have to reverse sort orders too, sigh...
2010-02-14 03:49:54 +00:00
head_tail='head'
(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
sort_type='-rss'
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)
bug fix, have to reverse sort orders too, sigh...
2010-02-14 03:49:54 +00:00
head_tail='tail'
(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
sort_type='%cpu'
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
if [[ $B_RUNNING_IN_SHELL != '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
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
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
A_PS_DATA=( $( ps aux --sort $sort_type | 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
(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 [[ $1 == 'cpu' ]];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
}
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
# neat and readable.
(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
fixed variable name
2010-02-01 06:33:41 +00:00
local repo_file='' repo_data_working='' repo_data_working2='' repo_line=''
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/'
added arch support for -r option
2010-02-01 05:51:09 +00:00
added some comments
2010-02-01 06:20:42 +00:00
# apt - debian, buntus
(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
REPO_DATA="$( grep -Esv '(^[[:space:]]*$|^[[:space:]]*#)' $apt_file $apt_file.d/*.list )"
tweak
2009-10-12 23:18:16 +00:00
REPO_FILE_ID='apt sources'
added some comments
2010-02-01 06:20:42 +00:00
# yum - fedora, redhat, centos, etc
code tweak for yum
2009-10-13 21:35:37 +00:00
elif [[ -d $yum_repo_dir || -f $yum_conf ]];then
(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
# older redhats put their yum data in /etc/yum.conf
code tweak for yum
2009-10-13 21:35:37 +00:00
for repo_file in $( ls $yum_repo_dir*.repo $yum_conf 2>/dev/null )
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
do
repo_data_working="$( gawk -v repoFile=$repo_file '
(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
# construct the string for the print function to work with, file name: data
function print_line( fileName, repoId, repoUrl ){
print fileName ":" repoId repoUrl
}
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
BEGIN {
code cleanup
2009-10-13 20:29:30 +00:00
FS="\n"
IGNORECASE=1
enabledStatus=""
repoTitle=""
urlData=""
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +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
(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
# 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
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
/^\[.+\]/ {
(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
if ( urlData != "" && repoTitle != "" ){
print_line( repoFile, repoTitle, urlData )
enabledStatus=""
urlData=""
repoTitle=""
}
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
gsub( /\[|\]/, "", $1 ) # strip out the brackets
repoTitle = $1 " ~ "
}
/^(mirrorlist|baseurl)/ {
sub( /(mirrorlist|baseurl)=/, "", $1 ) # strip out the field starter
urlData = $1
}
/^enabled=/ {
enabledStatus = $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
# 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
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
{
code tweak, that should be about it, all ready to go now.
2009-10-13 20:37:11 +00:00
if ( urlData != "" && enabledStatus != "" && repoTitle != "" ){
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
if ( enabledStatus !~ /enabled=0/ ){
(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 )
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
}
enabledStatus=""
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
END {
# print the last one if there is data for it
if ( urlData != "" && repoTitle != "" ){
print_line( repoFile, repoTitle, urlData )
}
}
bug fix
2009-10-13 20:14:45 +00:00
' $repo_file )"
(change version) added first attempt at yum repo handling in
2009-10-13 20:09:54 +00:00
# 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
$repo_data_working"
fi
repo_data_working=''
fi
done
REPO_FILE_ID='yum repos'
added some comments
2010-02-01 06:20:42 +00:00
# pisi - pardus
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
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
fixed variable name
2010-02-01 06:33:41 +00:00
while read repo_line
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
do
bug fix for pardus pisi line output, added file missing detection for arch repos
2010-02-01 18:02:37 +00:00
repo_line=$( gawk '
{
fixed bug with pardus pisi output, stripping out colors
2010-02-01 18:32:15 +00:00
# need to dump leading/trailing spaces and clear out color codes for irc output
bug fix for pardus pisi line output, added file missing detection for arch repos
2010-02-01 18:02:37 +00:00
sub(/^[[:space:]]+|[[:space:]]+$/,"",$0)
fixed bug with pardus pisi output, stripping out colors
2010-02-01 18:32:15 +00:00
# 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)
bug fix for pardus pisi line output, added file missing detection for arch repos
2010-02-01 18:02:37 +00:00
print $0
}' <<< $repo_line )
fixed variable name
2010-02-01 06:33:41 +00:00
if [[ -n $( grep '://' <<< $repo_line ) ]];then
repo_data_working="$repo_data_working:$repo_line\n"
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
else
fixed variable name
2010-02-01 06:33:41 +00:00
repo_data_working="$repo_data_working$repo_line"
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
done <<< "$REPO_DATA"
# echo and execute the line breaks inserted
added some comments
2010-02-01 06:20:42 +00:00
REPO_DATA="$( echo -e $repo_data_working )"
and some code cleanup
2010-02-01 06:23:44 +00:00
REPO_FILE_ID='pisi repo'
added some comments
2010-02-01 06:20:42 +00:00
# pacman - archlinux
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)
print repoFile ":" $2 "\\n"
}
' $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 )"
and some code cleanup
2010-02-01 06:23:44 +00:00
REPO_FILE_ID='arch repo servers'
(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=''
local runlevel_path=$( type -p runlevel )
if [[ -n $runlevel_path ]];then
runlvl="$( $runlevel_path | gawk '{ print $2 }' )"
fi
echo $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
(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 sensors_path=$( type -p sensors )
(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'
(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 $sensors_path ]];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=( $(
(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
$sensors_path | 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
}
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
}
}
'
) )
# the error case needs to go here because we are setting special array delimiter ','
else
A_SENSORS_DATA=( "You do not have the sensors app installed." )
fi
IFS="$ORIGINAL_IFS"
log_function_data "A_SENSORS_DATA: ${A_SENSORS_DATA[@]}"
# echo "A_SENSORS_DATA: ${A_SENSORS_DATA[@]}"
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
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_working='' mounted_partitions='' separator='' unmounted_fs=''
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
local dev_working='' uuid_working='' label_working=''
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
get_partition_uuid_label_data 'label'
get_partition_uuid_label_data 'uuid'
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
# 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]}"
separator='|'
fi
done
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
A_UNMOUNTED_PARTITION_DATA=( $( grep -Ev '('$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
(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 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
#### -------------------------------------------------------------------
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
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 $( egrep -i '( 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
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 $( egrep '^[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
tweaked some output for awk cpu detections for cell
2008-11-04 04:45:02 +00:00
string_number='Not Available'
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
(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=" "
local cpu_flags_working="$1 "
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
(change version) fixed bug in sse output for flags
2010-03-05 22:36:09 +00:00
cpu_flags=$(
echo "$cpu_flags_working" | 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
}
(change version) fixed bug in sse output for flags
2010-03-05 22:36:09 +00:00
/^(lm|nx|pni|svm|vmx|(sss|ss)e([2-9])?([a-z])?(_[0-9])?)$/ {
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
(change version) fixed bug in sse output for flags
2010-03-05 22:36: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
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,
# and in some cases, their children, with Lspci_Data
local Lspci_Data='' # only for verbose
(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
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
Lspci_Data="$( get_lspci_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
if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_SYSTEM == 'true' ]];then
print_system_data
fi
if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_CPU == 'true' ]];then
print_cpu_data
fi
if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_GRAPHICS == 'true' ]];then
print_gfx_data
fi
(change version) Some last code cleanup, comment cleanup, tweaked a few small things.
2008-11-11 23:36:25 +00:00
if [[ $VERBOSITY_LEVEL -ge 5 || $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
if [[ $VERBOSITY_LEVEL -ge 2 || $B_SHOW_NETWORK == 'true' ]];then
print_networking_data
fi
if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_DISK == 'true' ]];then
print_hard_disk_data
fi
if [[ $VERBOSITY_LEVEL -ge 4 || $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
(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
(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 [[ $VERBOSITY_LEVEL -ge 5 || $B_SHOW_SENSORS == 'true' ]];then
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
(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 [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_INFO == 'true' ]];then
print_info_data
fi
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
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 current_kernel=$( uname -rm ) # | gawk '{print $1,$3,$(NF-1)}' )
(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
local processes="$(( $( ps aux | wc -l ) - 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
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +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
# this gets that weird min/max final array item
local min_max_clock_nu=$(( ${#A_CPU_DATA[@]} - 1 ))
local min_max_clock=${A_CPU_DATA[$min_max_clock_nu]}
(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
if [[ $B_RUNNING_IN_SHELL == 'false' ]];then
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 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
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 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
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 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
short_data="${short_data}${C1}$SCRIPT_NAME${C2}${SEP1}$SCRIPT_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
short_data="${short_data} $NORMAL"
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
(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
local i='' card_one='Card-1' audio_data='' a_audio_data='' port_data='' pci_bus_id=''
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 a_audio_working='' alsa_driver='' alsa_data='' port_plural='' module_version=''
synched audio output to use usb id as well if -x runs
2011-04-30 23:10:06 +00:00
local bus_usb_text='' bus_usb_id=''
(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
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
(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
alsa_data=$( get_audio_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
IFS=","
a_audio_working=(${A_AUDIO_DATA[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
IFS="$ORIGINAL_IFS"
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
(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
# slightly complicated because 2nd array item could be the alsa data
(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 [[ ${#A_AUDIO_DATA[@]} -le 1 ]];then
(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
card_one='Card'
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
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 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 ${a_audio_working[2]} ]];then
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
# port_data=" ${C1}port${C2} ${a_audio_working[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
# 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
# this should only trigger if the $FILE_ASOUND_DEVICE data is used, not lspci -nn
(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 [[ -n ${a_audio_working[3]} && $B_EXTRA_DATA == 'true' ]];then
# note that for some reason, the module name is not the same as the module
# loaded to kernel name for audio drivers, and you'll need to change the -
module_version=$( print_module_version "${a_audio_working[3]}" 'audio' )
elif [[ -n ${a_audio_working[1]} && $B_EXTRA_DATA == 'true' ]];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_audio_working[1]}" 'audio' )
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) 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
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
alsa_driver=" ${C1}driver${C2} ${a_audio_working[1]}$module_version"
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
(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
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
port_data=" ${C1}port$port_plural${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
synched audio output to use usb id as well if -x runs
2011-04-30 23:10:06 +00:00
if [[ ${a_audio_working[1]} != 'snd-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'
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'
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]}
pci_bus_id=" ${C1}$bus_usb_text:${C2} $bus_usb_id"
(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
audio_data="${C1}$card_one${C2} ${a_audio_working[0]}$alsa_driver$port_data$pci_bus_id"
(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
audio_data=$( create_print_line "Audio:" "$audio_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_screen_output "$audio_data"
i=0 ## loop starts with 1 by auto-increment so it only shows cards > 1
while [[ -n ${A_AUDIO_DATA[++i]} ]]
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=''
(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
alsa_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
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 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 ${a_audio_working[3]} && $B_EXTRA_DATA == 'true' ]];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
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' )
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
bug fix in multiple gpu print out, bug fix in multiple audio card driver print out
2010-10-08 05:37:08 +00:00
alsa_driver=" ${C1}driver${C2} ${a_audio_working[1]}"
(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
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
port_data=" ${C1}port$port_plural${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
synched audio output to use usb id as well if -x runs
2011-04-30 23:10:06 +00:00
if [[ ${a_audio_working[1]} != 'snd-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'
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'
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]}
pci_bus_id=" ${C1}$bus_usb_text:${C2} $bus_usb_id"
(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
(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
audio_data="${C1}Card-$(( $i + 1 ))${C2} ${a_audio_working[0]}$alsa_driver$port_data$pci_bus_id"
(Change Version) Added alsa sound output as well if the /proc file is found
2008-11-14 00:42:13 +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
if [[ -n $audio_data ]];then
audio_data=$( create_print_line " " "$audio_data" )
print_screen_output "$audio_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
done
(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
# alsa driver data only prints out if sound card data is found
if [[ -n $alsa_data ]];then
(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
audio_data="${C1}Sound:${C2} $alsa_data"
(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
audio_data=$( create_print_line " " "$audio_data" )
print_screen_output "$audio_data"
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
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=''
local bmip_data='' cpu_cache='' cpu_vendor='' cpu_flags=''
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=","
local a_cpu_working=(${A_CPU_DATA[0]})
IFS="$ORIGINAL_IFS"
local cpu_model="${a_cpu_working[0]}"
## assemble data for output
local cpu_clock="${a_cpu_working[1]}"
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 tolower in awk instead of bash for cpu vendor compare
2008-11-07 20:04:28 +00:00
cpu_vendor=${a_cpu_working[5]}
(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 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]}
(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)'
cpu_count_print="$cpu_physical_count "
model_plural='s'
fi
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
local cpu_data_string="${cpu_count_print}${cpu_core_alpha} core"
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+++++++\"----------"
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
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 [[ -z ${a_cpu_working[2]} ]];then
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_working[2]="unknown"
fi
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
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
cpu_data=$( create_print_line "CPU$cpc_plural:" "${C1}${cpu_data_string}${C2} ${a_cpu_working[0]}$model_plural (${cpu_type})" )
(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 [[ $VERBOSITY_LEVEL -ge 3 || $B_SHOW_CPU == 'true' ]];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
# update for multicore, bogomips x core count.
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_EXTRA_DATA == 'true' ]];then
# if [[ $cpu_vendor != 'intel' ]];then
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
bmip_data=$( calculate_multicore_data "${a_cpu_working[4]}" "$(( $cpu_core_count * $cpu_physical_count ))" )
Try to fix L2 misreporting issue for intel core duo
2008-11-05 02:32:53 +00:00
# else
# bmip_data="${a_cpu_working[4]}"
# 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
bmip_data=" ${C1}bmips${C2} $bmip_data"
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
fi
Try to fix L2 misreporting issue for intel core duo
2008-11-05 02:32:53 +00:00
## note: this handles how intel reports L2, total instead of per core like AMD does
(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
# note that we need to multiply by number of actual cpus here to get true cache size
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 [[ $cpu_vendor != 'intel' ]];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
cpu_cache=$( calculate_multicore_data "${a_cpu_working[2]}" "$(( $cpu_core_count * $cpu_physical_count ))" )
Try to fix L2 misreporting issue for intel core duo
2008-11-05 02:32:53 +00:00
else
(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
cpu_cache=$( calculate_multicore_data "${a_cpu_working[2]}" "$cpu_physical_count" )
Try to fix L2 misreporting issue for intel core duo
2008-11-05 02:32:53 +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
# only print shortened list
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 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=$( process_cpu_flags "${a_cpu_working[3]}" )
cpu_flags=" ${C1}flags${C2} ($cpu_flags)"
fi
cpu_data="$cpu_data${C2} ${C1}cache${C2} $cpu_cache$cpu_flags$bmip_data${CN}"
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
# we don't this printing out extra line unless > 1 cpu core
if [[ ${#A_CPU_DATA[@]} -gt 2 ]] && [[ $B_SHOW_CPU == 'true' || $VERBOSITY_LEVEL -ge 5 ]];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
cpu_clock_speed='' # null < verbosity level 5
else
cpu_data="$cpu_data ${C1}clocked at${C2} ${a_cpu_working[1]} MHz${CN}"
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
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
cpu_data="$cpu_data $cpu_clock_speed"
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_screen_output "$cpu_data"
Some bash tweaks, tests on use of [ vs [[ brackets and arrays
2008-11-03 21:04:21 +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
# we don't this printing out extra line unless > 1 cpu core
if [[ ${#A_CPU_DATA[@]} -gt 2 ]] && [[ $B_SHOW_CPU == 'true' || $VERBOSITY_LEVEL -ge 5 ]];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
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
cpu_multi_clock_data="$cpu_multi_clock_data ${C1}($(( i + 1 )))${C2} ${a_cpu_working[1]} MHz${CN}"
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
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
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 $cpu_multi_clock_data ]];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
cpu_multi_clock_data=$( create_print_line " " "${C1}Clock Speeds:${C2}$cpu_multi_clock_data" )
print_screen_output "$cpu_multi_clock_data"
fi
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 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 "${a_cpu_working[3]}"
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
# args: $1 - cpu flag string
print_cpu_flags_full()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
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
local cpu_flags_full="$1" a_cpu_flags='' line_starter=''
local i=0 counter=0 max_length=18 max_length_add=18 flag='' flag_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
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
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
a_cpu_flags[$counter]="${a_cpu_flags[$counter]}$flag "
if [[ $i -ge $max_length ]];then
(( counter++ ))
max_length=$(( $max_length + $max_length_add ))
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
((i++))
done
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
if [[ $i -eq 0 ]];then
line_starter="${C1}CPU Flags${C2} "
else
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
}
print_gfx_data()
{
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFS
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
local gfx_data='' i='' card_id='' root_alert='' root_x_string='' a_gfx_working=''
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
local screen_resolution="$( get_graphics_res_data )"
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
local b_is_mesa='false' display_full_string='' gfx_bus_id='' gfx_card_data=''
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 res_tty='Res' xorg_data='' x_vendor_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
# set A_GFX_CARD_DATA
get_graphics_card_data
# set A_X_DATA
get_graphics_x_data
local x_vendor=${A_X_DATA[0]}
local x_version=${A_X_DATA[1]}
# 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]}" )
(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
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 [[ -z $x_vendor || -z $x_version ]];then
x_vendor_string="${C1}X-Vendor:${C2} 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
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
x_vendor_string="${C1}$x_vendor${C2} $x_version "
fi
if [[ $B_ROOT == 'true' ]];then
root_x_string='for root '
if [[ $B_RUNNING_IN_SHELL == 'true' || $B_CONSOLE_IRC == 'true' ]];then
res_tty='tty res'
(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
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_RUNNING_IN_X != 'true' ]];then
root_x_string="${root_x_string}out of X"
res_tty='tty res'
fi
if [[ -n $root_x_string ]];then
root_x_string="${C1}Gfx Data:${C2} N/A $root_x_string"
fi
display_full_string="$x_vendor_string${C1}${res_tty}:${C2} ${screen_resolution} $root_x_string"
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
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 [[ ${#A_GFX_CARD_DATA[@]} -gt 0 ]];then
for (( i=0; i < ${#A_GFX_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=","
a_gfx_working=( ${A_GFX_CARD_DATA[i]} )
IFS="$ORIGINAL_IFS"
gfx_bus_id=''
gfx_card_data=${a_gfx_working[0]}
if [[ $B_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_gfx_working[1]} ]];then
and also making busID into bus-ID to make it consistent as well
2011-04-30 23:37:24 +00:00
gfx_bus_id=" ${C1}bus-ID:${C2} ${a_gfx_working[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
else
and also making busID into bus-ID to make it consistent as well
2011-04-30 23:37:24 +00:00
gfx_bus_id=" ${C1}bus-ID:${C2} 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
if [[ ${#A_GFX_CARD_DATA[@]} -gt 1 ]];then
card_id="Card-$(($i+1)):"
else
card_id='Card:'
fi
gfx_data="$gfx_data${C1}$card_id${C2} $gfx_card_data$gfx_bus_id "
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
gfx_data="${C1}Card:${C2} Failed to Detect Video Card! "
Initial setup of repo
2008-10-28 00:40:43 +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
gfx_data=$( create_print_line "Graphics:" "${gfx_data}$display_full_string" )
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_screen_output "$gfx_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
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 [[ -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
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
## note: if glx render or version have no content, then mesa is true
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_SHOW_X_DATA == 'true' ]] && [[ $b_is_mesa != 'true' ]];then
if [[ $B_SHOW_X_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
(change version) removed pipe from glx line, forgot that one.
2008-12-04 01:22:19 +00:00
gfx_data=$( create_print_line " " "${C1}GLX Renderer${C2} ${glx_renderer} ${C1}GLX Version${C2} ${glx_version}${CN}" )
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
gfx_data="$gfx_data ${C1}Direct Rendering${C2} ${glx_direct_render}${CN}"
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
print_screen_output "$gfx_data"
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=''
typo fix
2009-08-07 00:24:15 +00:00
local dev_data='' size_data='' hdd_model='' usb_data='' hdd_name='' divisor=5
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"
local hdd_capacity=${a_hdd_basic_working[0]}
local hdd_used=${a_hdd_basic_working[1]}
logic cleanup in printout function for hdd data
2009-08-07 00:51:10 +00:00
if [[ $VERBOSITY_LEVEL -ge 3 || $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"
added -v 5 full disk output
2009-08-07 00:35:17 +00:00
if [[ $B_SHOW_DISK == 'true' || $VERBOSITY_LEVEL -ge 5 ]];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]} "
size_data=" ${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
hdd_temp_data=" ${hdd_temp_data}C"
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
bug fixes, tweaks, code cleanups for hdd printout
2009-08-07 00:22:17 +00:00
divisor=2 # for modulus line print out, either 2 items for full, or default for short
fi
hdd_name="${a_hdd_working[2]}"
logic cleanup in printout function for hdd data
2009-08-07 00:51:10 +00:00
hdd_string="$usb_data$dev_data$hdd_name$size_data$hdd_temp_data"
hdd_model="${hdd_model}${C1}$(($i+1)):${C2} $hdd_string "
# printing line one, then new lines according to $divisor setting, and after, if leftovers, print that line.
case $i in
0)
hdd_data=$( create_print_line "Disks:" "${C1}HDD${C2} ${C1}Total Size:${C2} ${hdd_capacity} (${hdd_used}) ${hdd_model}" )
print_screen_output "$hdd_data"
hdd_model=''
;;
*)
# using modulus here, if divisible by $divisor, print line, otherwise skip
if [[ $(( $i % $divisor )) -eq 0 ]];then
hdd_data=$( create_print_line " " "${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"
hdd_model=''
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
hdd_data=$( create_print_line " " "${hdd_model}${CN}" )
print_screen_output "$hdd_data"
Fixed long line wraps, rearranged hard disk info
2008-11-08 06:06:08 +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
else
Fixed long line wraps, rearranged hard disk info
2008-11-08 06:06:08 +00:00
hdd_data=$( create_print_line "Disks:" "${C1}HDD Total Size:${C2} ${hdd_capacity} (${hdd_used})${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"
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
(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 info_data=''
Correct runlevel check
2008-12-16 23:12:27 +00:00
local runlvl=''
(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 )"
local processes="$(( $( ps aux | wc -l ) - 1 ))"
local up_time="$( get_uptime )"
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!
# long_last=$( echo -ne "${C1}Processes${C2} ${processes}${CN} | ${C1}Uptime${C2} ${up_time}${CN} | ${C1}Memory${C2} ${MEM}${CN}" )
(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
info_data=$( create_print_line "Info:" "${C1}Processes${C2} ${processes} ${C1}Uptime${C2} ${up_time} ${C1}Memory${C2} ${memory}${CN}" )
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
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_SHOW_X_DATA != 'true' || $B_EXTRA_DATA == 'true' ]];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
runlvl="$( get_runlevel_data )"
if [[ -n $runlvl ]];then
Correct runlevel check
2008-12-16 23:12:27 +00:00
info_data="${info_data} ${C1}Runlevel${C2} ${runlvl}${CN}"
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
fi
if [[ $SHOW_IRC -gt 0 ]];then
(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
info_data="${info_data} ${C1}Client${C2} ${IRC_CLIENT}${IRC_CLIENT_VERSION}${CN}"
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
(no version change) removed v: from inxi version string
2008-11-23 19:37:51 +00:00
info_data="${info_data} ${C1}$SCRIPT_NAME${C2} $SCRIPT_VERSION_NUMBER${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
info_data="${info_data} ${NORMAL}"
fi
print_screen_output "$info_data"
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
}
(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
(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
modules=$( tr '[A-Z]' '[a-z]' <<< $modules )
(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
modules=$( tr '-' '_' <<< $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
echo " ${C1}v:${C2}$module_versions"
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
(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 i='' card_one='Card-1' 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=''
local bus_usb_id=''
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
get_networking_data
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[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
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
# 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
if [[ ${#A_NETWORK_DATA[@]} -le 1 ]];then
(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
card_one='Card'
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
fi
(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 ${a_network_working[1]} && $B_EXTRA_DATA == 'true' ]];then
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
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
driver_data=" ${C1}driver${C2} ${a_network_working[1]}$module_version"
(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
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
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
port_data=" ${C1}port$port_plural${C2} ${a_network_working[2]}"
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
first whack at usb networking/wifi cards, let's see how it goes
2011-04-30 05:44:46 +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 [[ -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]}
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]} )
fi
pci_bus_id=" ${C1}$bus_usb_text:${C2} $bus_usb_id"
(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
(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
card_string=''
(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
network_data="${C1}$card_one${C2} ${a_network_working[0]}$driver_data$port_data$pci_bus_id"
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
network_data=$( create_print_line "Network:" "$network_data" )
Tweaked output, fixed bugs, mostly done with major refactoring now
2008-10-29 23:02:24 +00:00
print_screen_output "$network_data"
removed legacy comment, args, etc
2011-04-25 07:02:05 +00:00
print_network_advanced_data
cleanup
2008-11-04 05:39:26 +00:00
i=0 ## loop starts with 1 by auto-increment so it only shows cards > 1
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
while [[ -n ${A_NETWORK_DATA[++i]} ]]
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"
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
port_data=''
bug fixes
2011-04-30 06:56:15 +00:00
driver_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
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=''
cleanup
2011-04-30 07:00:36 +00:00
bus_usb_text=''
bus_usb_id=''
(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 ${a_network_working[1]} && $B_EXTRA_DATA == 'true' ]];then
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
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
driver_data=" ${C1}driver${C2} ${a_network_working[1]}$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
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
port_data=" ${C1}port$port_plural${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]}
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]} )
fi
pci_bus_id=" ${C1}$bus_usb_text:${C2} $bus_usb_id"
(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
network_data="${C1}Card-$(( $i + 1 ))${C2} ${a_network_working[0]}$driver_data$port_data$pci_bus_id"
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
network_data=$( create_print_line " " "$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
Tweaked output, fixed bugs, mostly done with major refactoring now
2008-10-29 23:02:24 +00:00
print_screen_output "$network_data"
removed legacy comment, args, etc
2011-04-25 07:02:05 +00:00
print_network_advanced_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
done
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
if [[ $B_SHOW_ADVANCED_NETWORK == 'true' ]];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
# first check if it's a known wifi id'ed card, if so, no print of duplex/speed
if [[ -n $( grep -Esi '(wireless|wifi|wi-fi|wlan)' <<< ${a_network_working[0]} ) ]];then
b_is_wifi='true'
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
if [[ -n ${a_network_working[5]} ]];then
more variable fixes
2011-04-25 06:58:31 +00:00
if_id=${a_network_working[5]}
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
if [[ -n ${a_network_working[6]} ]];then
oper_state=${a_network_working[6]}
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
# no print out for wifi since it doesn't have duplex/speed data availabe
if [[ $b_is_wifi != 'true' ]];then
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"
else
speed=${a_network_working[7]}
fi
fixed some output irregularities
2011-04-25 18:59:27 +00:00
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
speed_string="${C1}speed:${C2} $speed "
if [[ -n ${a_network_working[8]} ]];then
duplex=${a_network_working[8]}
fi
duplex_string="${C1}duplex:${C2} $duplex "
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
if [[ -n ${a_network_working[9]} ]];then
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 [[ $B_RUNNING_IN_SHELL == 'true' ]];then
mac_id=${a_network_working[9]}
else
mac_id='<irc-filter>'
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
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
network_data="${C1}IF:${C2} $if_id ${C1}state:${C2} $oper_state $speed_string$duplex_string${C1}mac:${C2} $mac_id"
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
network_data=$( create_print_line " " "$network_data" )
print_screen_output "$network_data"
fi
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 )
local ip_data='' a_interfaces_working='' interfaces='' interfaces_2='' i=''
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
local if_id='' if_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
# 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'
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
ip_data=$( create_print_line " " "${C1}Wan IP:${C2} $ip" )
# 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'
if [[ -n ${a_interfaces_working[1]} ]];then
if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
if_ip=${a_interfaces_working[1]}
else
if_ip='<irc-filter>'
(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
if [[ $i -lt 3 ]];then
interfaces="$interfaces ${C1}IF IP:${C2} $if_id ${C1}-${C2} $if_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
else
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
# space on end here for lining up with line starter
interfaces_2="$interfaces_2${C1}IF IP:${C2} $if_id ${C1}-${C2} $if_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
fi
((i++))
done
print_screen_output "$ip_data$interfaces"
# then wrap it if needed
if [[ -n $interfaces_2 ]];then
interfaces_2=$( create_print_line " " "$interfaces_2" )
print_screen_output "$interfaces_2"
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
}
(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=''
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
local counter=0 line_max=160 i=0 a_partition_data='' line_starter=''
output for remote file systems
2009-02-05 01:59:08 +00:00
local partitionIdClean='' part_dev='' full_dev='' part_label='' full_label=''
(change version) added partition fs type output
2009-10-10 03:50:32 +00:00
local part_uuid='' full_uuid='' dev_remote='' full_fs=''
(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 handles the different, shorter, irc colors strings embedded in variable data
if [[ $B_RUNNING_IN_SHELL != 'true' ]];then
line_max=130
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
# and no color string data at all
if [[ $SCHEME -eq 0 ]];then
line_max=75
fi
(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
line_max=20
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
# 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
(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
partition_used=" ${C1}used:${C2} ${a_partition_working[2]} (${a_partition_working[3]})"
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
full_fs='N/A' # reset partition used to null
fi
full_fs=" ${C1}fs:${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
(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
# don't show user names in output
(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
if [[ -z $( grep -E '(^//|:/)' <<< ${a_partition_working[6]} ) ]];then
part_dev="/dev/${a_partition_working[6]}"
output for remote file systems
2009-02-05 01:59:08 +00:00
dev_remote='dev'
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
output for remote file systems
2009-02-05 01:59:08 +00:00
full_dev=" ${C1}$dev_remote:${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
full_label=" ${C1}label:${C2} $part_label"
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
full_uuid=" ${C1}uuid:${C2} $part_uuid"
fi
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
if [[ $B_RUNNING_IN_SHELL == 'false' ]];then
partitionIdClean=$( sed -r 's|/home/(.*)/(.*)|/home/##/\2|' <<< ${a_partition_working[0]} )
else
partitionIdClean=${a_partition_working[0]}
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
# because these lines can vary widely, using dynamic length handling here
moved fs output
2009-10-10 03:58:22 +00:00
a_partition_data[$counter]="${a_partition_data[$counter]}${C1}ID:${C2}$partitionIdClean ${C1}size:${C2} ${a_partition_working[1]}$partition_used$full_fs$full_dev$full_label$full_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
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
if [[ $( wc -c <<< ${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
partition_data=$( create_print_line "$line_starter" "${a_partition_data[$i]}" )
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
}
(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
(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
get_ps_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
(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
get_ps_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
(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_data=$( create_print_line "$line_starter" "$line_start_data" )
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
app_daemon='daemon:'
else
app_daemon='command:'
fi
app_name=" ${C1}$app_daemon${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
app_name="$app_name ${C1}(started by:${C2} ${a_ps_data[2]}${C1})${C2}"
fi
app_pid=" ${C1}pid:${C2} ${a_ps_data[6]}"
# ${C1}user:${C2} ${a_ps_data[8]}
case $1 in
cpu)
app_cpu=" ${C1}cpu:${C2} ${a_ps_data[4]}%"
if [[ $B_EXTRA_DATA == 'true' ]];then
extra_data=" ${C1}mem:${C2} ${a_ps_data[7]}MB (${a_ps_data[5]}%)${C2}"
fi
;;
mem)
cleaned up some variable misnamings
2010-02-13 06:10:31 +00:00
app_mem=" ${C1}mem:${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
extra_data=" ${C1}cpu:${C2} ${a_ps_data[4]}%"
fi
;;
esac
(( line_counter++ ))
count_nu="${C1}$line_counter -${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"
(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_data=$( create_print_line " " "$full_line" )
print_screen_output "$ps_data"
done
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
# 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=''
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 repo_full='' b_print_next_line='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
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++ ))
file_name=$( cut -d ':' -f 1 <<< $repo_line )
file_content=$( cut -d ':' -f 2-6 <<< $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.
if [[ $B_RUNNING_IN_SHELL != 'true' ]];then
file_content=$( echo $file_content | sed 's|://|: //|' )
else
file_content=$( echo $file_content )
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
# check file name, if different, update the holder for print out
if [[ $file_name != $file_name_holder ]];then
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
if [[ $REPO_FILE_ID != 'pisi repo' ]];then
repo_full="${C1}Active $REPO_FILE_ID in file:${C2} $file_name"
else
repo_full="${C1}$REPO_FILE_ID:${C2} $file_name"
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
repo_full=$( create_print_line "Repos:" "$repo_full" )
else
repo_full=$( create_print_line " " "$repo_full" )
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
code cleanup
2009-10-12 22:44:01 +00:00
repo_full=$( create_print_line "Repos:" "${C1}Error:${C2} $SCRIPT_NAME does not support this feature for your distro yet." )
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=''
(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
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
# always has at least 3 items, cpu/mobo/psu temp in it. If it's a single item, then
# it's an error message, not the real data arrays.
(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 [[ ${#a_sensors_working[@]} -eq 1 ]];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
cpu_temp="${C1}Error:${C2} ${A_SENSORS_DATA[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
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
cpu_temp="${C1}System Temperatures: cpu:${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
mobo_temp="${C1}mobo:${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
psu_temp="${C1}psu:${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
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +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
gpu_temp=$( cut -d ':' -f 2 <<< $gpu_temp )
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
bug fix, handled case of multiple gpus and temps
2009-08-03 08:21:11 +00:00
gpu_temp="${C1}gpu:${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
cpu_fan="${C1}Fan Speeds (in rpm): cpu:${C2} $cpu_fan "
(( fan_count++ ))
;;
1)
if [[ -n ${a_sensors_working[1]} ]];then
mobo_fan="${C1}mobo:${C2} ${a_sensors_working[1]} "
(( fan_count++ ))
fi
;;
2)
if [[ -n ${a_sensors_working[2]} ]];then
(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
ps_fan="${C1}psu:${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
sys_fans="$sys_fans${C1}sys-$fan_number:${C2} ${a_sensors_working[$j]} "
else
sys_fans2="$sys_fans2${C1}sys-$fan_number:${C2} ${a_sensors_working[$j]} "
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
sys_fans="$sys_fans${C1}fan-$fan_number:${C2} ${a_sensors_working[$j]} "
else
sys_fans2="$sys_fans2${C1}fan-$fan_number:${C2} ${a_sensors_working[$j]} "
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"
temp_data=$( create_print_line "Sensors:" "$temp_data" )
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
fan_data=$( create_print_line " " "$fan_data" )
print_screen_output "$fan_data"
# and then second wrapped fan line if needed
if [[ -n $sys_fans2 ]];then
fan_data2=$( create_print_line " " "$sys_fans2" )
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
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
local system_data='' bits='' desktop_environment=''
(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 host_name=$( hostname )
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 current_kernel=$( uname -rm ) # | gawk '{print $1,$3,$(NF-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 distro="$( get_distro_data )"
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
if [[ $B_RUNNING_IN_X == 'true' ]];then
changed toolkit to show only with -xS, that's not that important.
2011-05-20 05:24:57 +00:00
desktop_environment=$( detect_desktop_environment )
if [[ -z $desktop_environment ]];then
desktop_environment='N/A'
fi
desktop_environment="${C1}Desktop${C2} $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
fi
# check for 64 bit first
(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 $( uname -m | grep -o 'x86_64' ) ]];then
(Version Change) Added 32/64 bit output on System -S line
2008-12-17 04:09:01 +00:00
bits="(64 bit)"
else
bits="(32 bit)"
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
if [[ $B_SHOW_HOST == '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
system_data=$( create_print_line "System:" "${C1}Host${C2} $host_name ${C1}Kernel${C2}" )
(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
else
(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
system_data=$( create_print_line "System:" "${C1}Kernel${C2}" )
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 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
system_data="$system_data $current_kernel $bits $desktop_environment${C1}Distro${C2} $distro"
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_screen_output "$system_data"
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=''
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
full_dev="${C1}ID:${C2} $full_dev"
if [[ -z ${a_unmounted_data[1]} ]];then
full_size='N/A'
else
full_size=${a_unmounted_data[1]}
fi
full_size="${C1}size:${C2} $full_size"
if [[ -z ${a_unmounted_data[2]} ]];then
full_label='N/A'
else
full_label=${a_unmounted_data[2]}
fi
full_label="${C1}label:${C2} $full_label"
if [[ -z ${a_unmounted_data[3]} ]];then
full_uuid='N/A'
else
full_uuid=${a_unmounted_data[3]}
fi
full_uuid="${C1}uuid:${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
full_fs="${C1}fs:${C2} ${a_unmounted_data[4]}"
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
unmounted_data=$( create_print_line "$line_starter" "$full_string" )
print_screen_output "$unmounted_data"
done
else
unmounted_data=$( create_print_line "Unmounted:" "No unmounted partitions detected." )
print_screen_output "$unmounted_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