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

4394 lines
142 KiB
Plaintext
Raw Normal View History

Initial setup of repo
2008-10-28 00:40:43 +00:00
#!/bin/bash
########################################################################
#### Script Name: inxi
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
#### version: 1.1.8
(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
#### Date: August 2 2009
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
Added pardus to distro supported list, changed date to be straight: day month year
2009-01-23 17:43:15 +00:00
#### inxi version: Copyright (C) 2008-9 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
########################################################################
Initial setup of repo
2008-10-28 00:40:43 +00:00
#### DEPENDENCIES
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
#### bash >=3.0(bash), df;readlink;stty;tr;uname;wc(coreutils),
Initial setup of repo
2008-10-28 00:40:43 +00:00
#### gawk(gawk), grep(grep), hostname(hostname), lspci(pciutils),
Correct runlevel check
2008-12-16 23:12:27 +00:00
#### ps;uptime(procps), glxinfo;xdpyinfo;xrandr(xbase-clients)
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
####
#### Arrays work in bash 2.05b, but "egrep -m" does not
####
(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
#### RECOMMENDS (Needed to run certain features)
#### For local interfaces/IP test: ifconfig (in net-tools for Debian systems)
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
#### runlevel(sysvinit): to view current runlevel while not in X window system
#### Bash 3.1 for proper array use
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.
####
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
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=''
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
COLOR_SCHEME_SET=''
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=''
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 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=''
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 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'
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'
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) 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'
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'
(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
# sensors only if installed
B_SENSORS='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 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) 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'
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
# Test for X running
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_X_RUNNING='false'
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
# test for dbus irc client
B_DBUS_CLIENT='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 ]]
B_PROC='false'
B_CPUINFO='false'
B_MEMINFO='false'
B_ASOUND_CARDS='false'
B_ASOUND_VERSION='false'
B_BASH_ARRAY='false'
B_IFCONFIG='false'
B_LSB_DIR='false'
B_SCSI_DIR='false'
B_MODULES_DIR='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_MOUNTS_DIR='false'
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
B_PARTITIONS_DIR='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
### File's used when present
FILE_CPUINFO='/proc/cpuinfo'
FILE_MEMINFO='/proc/meminfo'
FILE_ASOUND_DEVICE='/proc/asound/cards'
FILE_ASOUND_VERSION='/proc/asound/version'
FILE_LSB_RELEASE='/etc/lsb-release'
FILE_SCSI='/proc/scsi/scsi'
FILE_MODULES='/proc/modules'
FILE_MOUNTS='/proc/mounts'
FILE_PARTITIONS='/proc/partitions'
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
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
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
# Defaults to 2, make this 1 for normal, 0 for no colorcodes at all. Set to any other valid scheme you like.
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.
fixed color bug I caused, I changed default to 0 for my theme and it went to commit. Reversed it back to 2.
2009-07-08 03:57:34 +00:00
DEFAULT_SCHEME=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
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
Bug fix on color setting
2008-10-29 21:47:13 +00:00
SCHEME=0 # set default 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
# 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
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
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
updated trunk inxi
2009-05-28 20:26:29 +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="       "
IRC_COLORS=" \x0314 \x0301 \x0304 \x0305 \x0309 \x0303 \x0308 \x0307"
updated trunk inxi
2009-05-28 20:26:29 +00:00
# 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         "
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 )
Initial setup of repo
2008-10-28 00:40:43 +00:00
# See above for notes on EMPTY
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_COLOR_SCHEMES=( EMPTY,EMPTY,EMPTY NORMAL,NORMAL,NORMAL BLUE,NORMAL,NORMAL GREEN,YELLOW,NORMAL DYELLOW,NORMAL,NORMAL CYAN,BLUE,NORMAL RED,NORMAL,NORMAL GREEN,NORMAL,NORMAL YELLOW,NORMAL,NORMAL GREEN,DGREEN,NORMAL BLUE,RED,NORMAL BLUE,NORMAL,RED YELLOW,WHITE,GREEN BLUE,NORMAL,GREEN DCYAN,NORMAL,DMAGENTA )
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.|
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
A_NORMAL_BANS=( corporation communications gmbh technologies technology group $'\2'"\<ltd\>" ltd. $'\2'"\<inc\>" inc. $'\2'\<co\> co. "(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
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
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
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
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
# Source user config overrides, ~/.inxi/inxi.conf
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
if [[ $COLOR_SCHEME_SET != 'true' ]];then
set_color_scheme "$DEFAULT_SCHEME"
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\""'
# Do this after sourcing of config overrides so user can customize banwords
BAN_LIST_NORMAL=$( make_ban_lists "${A_NORMAL_BANS[@]}" ) # Contrary to my previous belief, "${ARR[@]}" passes a quoted list, not one string
BAN_LIST_CPU=$( make_ban_lists "${A_CPU_BANS[@]}" )
##echo "BAN_LIST_NORMAL='$BAN_LIST_NORMAL'"
# now set the script BOOLEANS for files required to run features
if [[ -d "/proc/" ]];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_PROC='true'
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
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_CPUINFO='true'
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_MEMINFO ]];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_MEMINFO='true'
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_ASOUND_DEVICE ]];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_ASOUND_CARDS='true'
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_ASOUND_VERSION ]];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_ASOUND_VERSION='true'
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -f $FILE_LSB_RELEASE ]];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_LSB_DIR='true'
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_SCSI ]];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_SCSI_DIR='true'
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
# lack of ifconfig will throw an error only upon it's usage
(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 [[ -n $( type -p ifconfig ) ]]; then
commit the HT, SMP, etc changes. All tests seem to pass
2009-01-05 22:02:38 +00:00
B_IFCONFIG='true'
else
(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_INTERFACES_DATA=( "Interfaces tool requires missing app: ifconfig" )
fi
if [[ -n $( type -p sensors ) ]];then
B_SENSORS='true'
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
if [[ -n $DISPLAY ]];then
B_X_RUNNING='true'
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_MODULES ]];then
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_MODULES_DIR='true'
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_MOUNTS ]];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
B_MOUNTS_DIR='true'
fi
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
if [[ -e $FILE_PARTITIONS ]];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_PARTITIONS_DIR='true'
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
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
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 app_name='' app_data=''
# bc removed from deps for now
local depends="df free gawk grep hostname lspci ps readlink tr uname uptime wc"
updated trunk inxi
2009-05-28 20:26:29 +00:00
local x_apps="xrandr xdpyinfo glxinfo"
Testing seems to have gone ok, still working on damentz patch. The code seems quiet good. H2, awesome job on it :) Any thoughts about inxi 1.0 ?
2008-12-24 09:59:03 +00:00
if [[ $B_X_RUNNING == '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
app_data=$( type -p $app_name )
if [[ -z $app_data ]];then
script_debugger "Resuming in non X mode: $app_name not found in path"
B_X_RUNNING='false'
break
fi
done
fi
app_name=''
for app_name in $depends
do
app_data=$( type -p $app_name )
if [[ -z $app_data ]];then
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
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
local i='' script_colors='' color_codes=''
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
color_codes=( $ANSI_COLORS )
else
color_codes=( $IRC_COLORS )
fi
for (( i=0; i < ${#A_COLORS_AVAILABLE[@]}; i++ ))
do
eval "${A_COLORS_AVAILABLE[i]}=\"${color_codes[i]}\""
done
IFS=","
script_colors=( ${A_COLOR_SCHEMES[$1]} )
IFS="$ORIGINAL_IFS"
# then assign the colors globally
C1="${!script_colors[0]}"
C2="${!script_colors[1]}"
CN="${!script_colors[2]}"
# ((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
}
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
;;
(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
7) error_message="One of the options you entered in your script parameters: $2\nIs not supported. For supported options, 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
;;
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
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
local wget_error=0
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..."
# first test if path is good, need to make sure it's good because we're -O overwriting file
wget -q --spider $1$SCRIPT_NAME || wget_error=$?
# then do the actual download
if [[ $wget_error -eq 0 ]];then
wget -q -O $SCRIPT_PATH/$SCRIPT_NAME $1$SCRIPT_NAME || wget_error=$?
if [[ $wget_error -eq 0 ]];then
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
fi
fi
# now run the error handlers on any wget failure
if [[ $wget_error -gt 0 ]];then
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
}
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
released qt4 konvi 'fix' and updated main. Had to reorder tests so that $PATH is updated before dependencies are searched.
2009-07-08 03:50:28 +00:00
if [[ $KONVI -eq 1 ]]; 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
elif [[ $KONVI -eq 3 ]]; then ## dbus Konversation (> 1.2 (qt4))
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
updated trunk inxi
2009-05-28 20:26:29 +00:00
# <comment here. what is this for?>
(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
(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
while getopts Ac:CdDfFGhHiIlNpPsSuv: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'
;;
c) if [[ -n $( egrep '^[0-9][0-9]?$' <<< $OPTARG ) ]];then
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
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'
;;
(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 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) 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) 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) Fixed a fairly major bug with both short output handling and debugging output in get_parameters. Prevented proper handling of non line/F/d/v type options and short output. Update scripts to this version, and hopefully that will be it for now.
2008-11-12 01:39:27 +00:00
v) if [[ -n $( egrep "^[0-9][0-9]?$" <<< $OPTARG ) && $OPTARG -le $VERBOSITY_LEVELS ]];then
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'
;;
@) if [[ -n $( egrep "^([1-9]|10)$" <<< $OPTARG ) ]];then
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
if [[ $OPTARG -ge 8 ]];then
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
if [[ $OPTARG -eq 10 ]];then
B_LOG_COLORS='true'
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
elif [[ $OPTARG -eq 9 ]];then
B_LOG_FULL_DATA='true'
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
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
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 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()
{
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
local color_scheme_count=${#A_COLOR_SCHEMES[@]}
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"
(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 ""
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."
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 "-c Available color schemes. Scheme number is required."
print_screen_output " Supported schemes: 0-$color_scheme_count Example: $SCRIPT_NAME -c 11"
(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."
(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 "-F Show Full output for $SCRIPT_NAME. Does not show extra verbose options like -f -u -l or -p"
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)."
(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 "-N Show Network card information."
(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."
(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_screen_output "-s Show sensors output (if sensors installed/configured): mobo/cpu temp; detected fan speeds."
(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 "-S Show System information: host name, kernel, distro"
(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"
(No version change) Added item to -v5 help menu.
2008-11-11 23:41:46 +00:00
print_screen_output " 5 - For multicore systems, also show per core clock speeds; shows audio card."
(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;"
print_screen_output " direct rendering status for Graphics (in X). Only works with verbose or line output."
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"
altered -x help text a bit to make it more clear
2009-08-03 06:04:25 +00:00
print_screen_output " added to /etc/sudoers (sudo v. 1.7 or newer) (path to hddtemp): <username> ALL = NOPASSWD: /usr/sbin/hddtemp"
(no version change) Made help menu slightly more readable by adding linebreak between categories
2008-11-19 20:35:09 +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."
(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
(no version change) Made help menu slightly more readable by adding linebreak between categories
2008-11-19 20:35:09 +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."
print_screen_output ""
bug fix, this is the real one
2008-11-19 19:59:05 +00:00
fi
(No version change) Fixed typo in function call.
2008-11-11 01:18:57 +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"
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 ""
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."
Fixed special requirement for antiX id, hopefully distros won't do this type of random file generation and content, a single string in the distro id is what they should have, ie: sidux-version, debian_version, not multiple lines
2008-10-31 03:07:52 +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:"
(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_screen_output "Copyright (C) 2008-9 Scott Rogers, Harald Hope, aka trash80 & h2"
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 ""
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
}' )"
IRC_CLIENT="BitchX"
;;
finch)
IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
print $2
}' )"
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
}' )"
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
}' )"
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 ) "
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
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=''
konvi_dbus_exist=$( qdbus | grep "org.kde.konversation" )
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) 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 i='' alsa_data='' alsa_driver='' device_count=''
(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)' )
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 [[ $device_count -eq 1 ]] && [[ $B_ASOUND_CARDS == '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)
cards[audioCard]++
# loop until you get to the end of the data block
while (getline && !/^$/) {
if (/driver in use/) {
drivers[audioCard] = drivers[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
else if (/kernel modules:/) {
modules[audioCard] = modules[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
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=""
(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]
}
if (ports[i] != "") {
usePorts = ports[i]
}
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 (modules[i] != "" ) {
useModules = modules[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
}
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
}
if (ports[i] != "") {
usePorts=ports[i]
}
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 (modules[i] != "" ) {
useModules = modules[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
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 a[j] "," useDrivers "," usePorts "," useModules
(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
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 [[ ${#A_AUDIO_DATA[@]} -eq 0 ]] && [[ $B_ASOUND_CARDS == '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
}
(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 ) )
(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
for usb_proc_file in /proc/asound/*
do
# if lsusb exists, the file is a symlink, and contains an important usb exclusive file: continue
if [[ -n $( which lsusb ) && -L $usb_proc_file && -e $usb_proc_file/usbid ]]; then
# 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 )
usb_data=$( lsusb -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"
(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=$( gawk '{
gsub( /,/, " ", $0 )
small bug fix in awk, now will output whole usb line
2009-02-18 06:57:28 +00:00
for( i=7; i <= NF; i++ ) {
(change version) added damentz usb audio patch, debugged, cleaned up, should be working, we'll see.
2009-02-18 06:17:45 +00:00
printf( $i " " )
}
}' <<< "$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[@]}
A_AUDIO_DATA[$array_count]="$usb_data,snd-usb-audio,,"
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
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_ASOUND_VERSION == '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
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_CPUINFO == '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
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_CPUINFO == 'true' ]];then
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 trunk inxi
2009-05-28 20:26:29 +00:00
# algorithm
# if > 1 processor && processor id (physical id) == core id then Hyperthreaded (HT)
small whitespace clean up
2009-01-06 22:20:06 +00:00
# if > 1 processor && different processor ids then Multiple Processors (SMP)
# if > 1 processor && processor id != core id then Multi-Core Processors (MCP)
# if = 1 processor then single core/processor Uni-Processor (UP)
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
if [[ $B_CPUINFO == '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
(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
core_count = 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
i = 0
(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
index_temp = ""
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
(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
physical_cpu_count = 0
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
processor_logical_count = 0
more indentation cleanup
2009-01-06 22:22:56 +00:00
processors = 1
type = "UP"
(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
}
# counts logical processors, both HT and physical
/^processor/ {
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
processor_logical_count = $NF + 1
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
# counts physical cores (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
/^cpu cores/ {
num_of_cores = $NF
}
# array of physical cpus ids
/^physical/ {
(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_physical_id[i] = $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/ {
(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_core_id[i] = $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
i++
}
END {
more indentation cleanup
2009-01-06 22:22:56 +00:00
# look for the largest id number, and assign it
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
for ( j = 0; j < processor_logical_count; j++ ) {
(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
if ( a_core_id[j] > core_count ) {
core_count = a_core_id[j]
more indentation cleanup
2009-01-06 22:22:56 +00:00
}
}
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
core_count = core_count + 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
# trick, set the index equal to value, if the same, it will overwrite
# this lets us create the actual array of true cpu physical ids
for ( j in a_physical_id ) {
index_temp = a_physical_id[j]
a_cpu_physical_working[index_temp] = a_physical_id[j]
}
# note that length() is a gawk >= 3.1.5 only method, better to do it manually
for ( j in a_cpu_physical_working ) {
++physical_cpu_count
}
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
more indentation cleanup
2009-01-06 22:22:56 +00:00
# looking at logical processor counts over 1, which means either HT, SMP or MCP
(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
# http://en.wikipedia.org/wiki/Symmetric_multiprocessing
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
if ( processor_logical_count > 1 ) {
if ( processor_logical_count > core_count && physical_cpu_count > 1 ) {
type = "SMP-HT" # could be Xeon/P4 HT dual cpu
(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
}
Fixed bug in ht detection, much simpler now, this should work I hope.
2009-02-04 06:32:10 +00:00
else if ( processor_logical_count > 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
type = "HT" # this is more than likely a P4 w/HT or an Atom 270
Refactored, a few cosmetic changes.
2009-01-06 22:13:48 +00:00
}
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
else {
more indentation cleanup
2009-01-06 22:22:56 +00:00
type = "SMP"
}
}
(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
# make sure to handle up cpus too
else {
core_count = 1
physical_cpu_count = 1
}
print type " " physical_cpu_count " " core_count
more indentation cleanup
2009-01-06 22:22:56 +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_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
}
(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
##
if [[ " $DISTROS_LSB_GOOD " == *" ${i} "* ]] && [[ $B_LSB_DIR == '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 ]]
if [[ $B_LSB_DIR == '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
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 [[ -z $distro ]] && [[ $B_LSB_DIR == '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=''
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_LSB_DIR == '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
}
END {
(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
print distroId distroRelease distroCodename
(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 )
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
(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
# if [[ -n $( which 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()
{
local gpu_temp='' gpu_fan=''
# we'll try for nvidia/ati, then add if more are shown
if [[ -n $( type -p nvidia-settings ) ]];then
gpu_temp=$( nvidia-settings -q GPUCoreTemp | gawk -F ': ' '
BEGIN {
IGNORECASE=1
}
/Attribute (.*)[0-9]+\.$/ {
gsub(/\./, "", $2)
if ( $2 ~ /^[0-9]+$/ ) {
print $2
}
}'
)
elif [[ -n $( type -p aticonfig ) ]];then
# gpu_temp=$( aticonfig --adapter=0 --od-gettemperature | gawk -F ': ' '
gpu_temp=$(echo "$sample" | gawk -F ': ' '
BEGIN {
IGNORECASE=1
}
/Sensor (.*)[0-9\.]+ / {
gpuTemp=gensub(/(.*) ([0-9\.]+) (.*)/, "\\2", "1", $2)
if ( gpuTemp ~ /^[0-9\.]+$/ ) {
print gpuTemp
}
}'
)
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
}
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)
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 $NF
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
For video, added null case in video card detection
2008-10-31 02:00:02 +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_GFX_CARD_DATA[@]} -eq 0 ]];then
For video, added null case in video card detection
2008-10-31 02:00:02 +00:00
A_GFX_CARD_DATA[0]='Failed to Detect Video Card!'
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
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
Added in root test for rest of get gfx data sections to avoid debugger gfx errors
2009-03-17 01:56:21 +00:00
if [[ $B_X_RUNNING == '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 cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
local screen_resolution=''
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) 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 [[ $B_X_RUNNING == '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
screen_resolution=$( xrandr | 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
/\*/ {
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
END {
for (n in res) {
(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
if (res[n] ~ /^[[:digit:]]+x[[:digit:]]+/) {
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
line = line ? line ", " res[n] : res[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
}
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 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
if (line) {
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(line)
(Change version number) Fixed syntax of gawk, made it all consistent, one method for everything, hanging { now in gawk for all structures and flow controls Fixed small double space thing for kernel output also. Removed all one liners from gawk, like BEGIN { IGNORECASE = 1 }, and now use NO one liner flow controls at all. This is the new convention, neither trash nor I were comfortable enough with gawk to really check the actual programming syntax, but now it's kind of obvious that the same rules apply: all one liner flow controls hide logic, and give bugs somewhere to live. Same as any other language. What a surprise.
2009-01-26 22:44:52 +00:00
}
Fixed a bug reported for partition information output, case where df splits its output lines because the first field is too long. Now the get partition info function reads back from the last item per record, not from the first one. Since the detection is based on the last item in the line, this should maybe fix that issue. Seen with LVM naming for example. We'll see if this works or not.
2008-11-07 17:38:30 +00:00
}' )
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 $screen_resolution ]];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
screen_resolution=$( xdpyinfo | gawk '
/dimensions/ {
print $2
}' )
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
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
if [[ $B_MODULES_DIR == '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
Added in root test for rest of get gfx data sections to avoid debugger gfx errors
2009-03-17 01:56:21 +00:00
if [[ $B_X_RUNNING == '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
}' )
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 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_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
A_X_DATA[0]="$x_vendor"
A_X_DATA[1]="$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
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 -version 2>&1 | gawk '/^X Window System Version/ { print $5 }'
#This method could be used in the future to detect X when X is not running,
#however currently inxi ignores X checks when X is not found.
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
}
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 cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
local hdd_data="$( df --exclude-type=aufs --exclude-type=tmpfs --exclude-type=iso9660 )"
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
/^\/dev\/(mapper\/|[hs]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
fixed hdd bug caused by missing $ in var. Merry Christmas
2008-12-25 12:23:30 +00:00
if [[ $B_PARTITIONS_DIR == '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" '
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
/[hs]d[a-z]$/ {
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
fixed bug with space in user partition names in hard disk size
2009-01-09 02:24:25 +00:00
$1 ~ /^(3|22|33|8)$/ && $NF ~ /[hs]d[a-z]$/ && ( $2 % 16 == 0 || $2 % 16 == 8 ) {
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=''
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
local sd_ls_by_id='' ls_disk_by_id=''
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
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'
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_SCSI_DIR == '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) 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 [[ ${#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
a_temp_working[2]=${a_temp_scsi[$j]}
if [[ -n $( grep 'usb-' <<< $sd_ls_by_id ) ]];then
Made (usb) to USB to make more readable
2008-11-09 20:28:26 +00:00
a_temp_working[3]='USB'
Added null data handler for temp array scsi
2008-11-08 22:26:16 +00:00
fi
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
a_temp_working[2]=$temp_name
else
a_temp_working[2]="Name n/a"
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
else
a_temp_working[2]="Name n/a"
fi
Added array item, usb, for advanced hard disk output
2008-11-08 21:56:16 +00:00
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()
{
local hdd_temp='' sudo_command=''
if [[ -n $( which hddtemp ) && -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
if [[ $B_ROOT != 'true' && -n $( which sudo ) ]];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) 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
hdd_temp=$( eval $sudo_command hddtemp -nq -u C $1 )
if [[ -n $hdd_temp && -n $( grep -E '^([0-9]+)$' <<< $hdd_temp ) ]];then
echo $hdd_temp
fi
fi
}
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=''
added cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
if [[ $B_MEMINFO == 'true' ]];then
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=''
if [[ -n $( which modinfo ) ]];then
module_version=$( modinfo $1 | 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
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
}
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).*$/ {
nic=gensub(/^[0-9a-f:.]+ [^:]+: (.+)$/,"\\1","g",$0)
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)
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
eth[nic]++
while (getline && !/^$/) {
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
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 " "
}
if (/driver in use/) {
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
}
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/) {
modules[nic] = modules[nic] gensub(/(.*): (.*)/,"\\2","g",$0) ""
}
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=""
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
if (eth[i]>1) {
a[j]=eth[i]"x "i
trying to get ps3 to show some basic output
2008-11-04 04:01:02 +00:00
## note: this loses the plural ports case, is it needed anyway?
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
if (ports[i] != "") {
usePorts=ports[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
if (drivers[i] != "") {
useDrivers=drivers[i]
}
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 (modules[i] != "" ) {
useModules = modules[i]
}
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
}
else {
a[j]=i
Added proper antix-version handling to get distro name
2008-11-03 20:41:39 +00:00
if (ports[i] != "") {
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
usePorts=ports[i]
Added proper antix-version handling to get distro name
2008-11-03 20:41:39 +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
if (drivers[i] != "") {
useDrivers=drivers[i]
}
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 (modules[i] != "" ) {
useModules = modules[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
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 a[j] "," useDrivers "," usePorts "," useModules
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"
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[@]}"
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
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_IFCONFIG == 'true' ]];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) 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_INTERFACES_DATA=( $( ifconfig | 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"
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
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 cat and sys info logging for 9, 8 default, 10 color logging
2009-05-29 03:18:36 +00:00
local main_partition_data="$( df -h -T --exclude-type=aufs --exclude-type=tmpfs --exclude-type=iso9660 )"
local swap_data="$( swapon -s )"
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=""
comment tweak
2009-03-02 02:25:53 +00:00
# this is required because below we are subtracting from NF, so it has to be > 4
(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.
(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
( NF < 5 ) && ( $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
}
(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$/ {
Bug fix
2009-03-02 02:16:10 +00:00
print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",main," 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]+\%/ ) {
Bug fix
2009-03-02 02:16:10 +00:00
print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",secondary," 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]+\%/ ) {
Bug fix
2009-03-02 02:16:10 +00:00
print $(NF - 1) " " $NF "," $(NF - 5) "," $(NF - 4) "," $(NF - 2) ",secondary," 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]+\%/ ) {
Bug fix
2009-03-02 02:16:10 +00:00
print $(NF - 2) " " $(NF - 1) " " $NF "," $(NF - 6) "," $(NF - 5) "," $(NF - 3) ",secondary," 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
}
' )
(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 )
print "swap-" swapCounter "," size "GB," used "GB," percentUsed "\%,main," devBase
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"
(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=''
local dev_disk_label='' dev_disk_uuid='' dev_item='' dev_label='' dev_uuid=''
local variables added to cleanup
2009-02-05 02:12:18 +00:00
local mount_point=''
(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 [[ -d /dev/disk/by-label ]];then
dev_disk_label="$( ls -l /dev/disk/by-label )"
fi
if [[ -d /dev/disk/by-uuid ]];then
dev_disk_uuid="$( ls -l /dev/disk/by-uuid )"
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 'raw' "dev_disk_label:\n$dev_disk_label\n\ndev_disk_uuid:\n$dev_disk_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
(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_MOUNTS_DIR == '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"
# note: for swap this will already be set
(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 [[ -z ${a_partition_working[5]} ]];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 != "" ) {
Fixed small arch bug
2009-02-05 01:36:03 +00:00
if ( partTemp ~ /[hs]d[a-z][0-9]/ ) {
(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
# echo dev_partition_data: $dev_partition_data
# assemble everything we could get for dev/h/dx, label, and uuid
IFS=","
A_PARTITION_DATA[i]=${a_partition_working[0]}","${a_partition_working[1]}","${a_partition_working[2]}","${a_partition_working[3]}","${a_partition_working[4]}","$dev_partition_data
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"
dev_item=${a_partition_working[5]}
dev_label=${a_partition_working[6]}
dev_uuid=${a_partition_working[7]}
(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
if [[ -n $dev_disk_uuid ]] && [[ -z $dev_item && -n $dev_uuid ]];then
(change version) bug fix, now it should work for all uuid/label
2009-02-07 08:09:00 +00:00
dev_item=$( echo "$dev_disk_uuid" | gawk '
/'$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
}' )
bug fixes
2009-02-07 07:51:09 +00:00
elif [[ -n $dev_disk_label ]] && [[ -z $dev_item && -n $dev_label ]];then
bug fix for label/uuid for root, that was trickier than I realized
2009-02-07 07:48:35 +00:00
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
bug fix for label/uuid for root, that was trickier than I realized
2009-02-07 07:48:35 +00:00
if [[ -n $dev_disk_uuid ]] && [[ -n $dev_item && -z $dev_uuid ]];then
dev_uuid=$( echo "$dev_disk_uuid" | gawk '
/'$dev_item'$/ {
print $(NF - 2)
}' )
bug fixes
2009-02-07 07:51:09 +00:00
fi
bug fix for label/uuid for root, that was trickier than I realized
2009-02-07 07:48:35 +00:00
if [[ -n $dev_disk_label ]] && [[ -n $dev_item && -z $dev_label ]];then
dev_label=$( echo "$dev_disk_label" | gawk '
/'$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) 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
(change version) bug fix, now it should work for all uuid/label
2009-02-07 08:09:00 +00:00
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
# 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]}","$dev_item","$dev_label","$dev_uuid
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
}
(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) 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) 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 [[ $B_SENSORS == 'true' ]];then
# 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) 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
sensors | 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
# 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.
(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)(.*)\+([0-9]+)(.*)[ \t°](C|F)/ && $2 ~ /^[ \t]*\+([0-9]+)/ {
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) 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) 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
/^(AUX|FAN(1)? |CHASSIS(1)? )(.*)[ \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
aFanMain[4]=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
/^FAN([2-9]) |CHASSIS([2-9] )(.*)[ \t]*([0-9]+)[ \t]RPM/ {
sysFanNu=gensub( /^(FAN|CHASSIS)([2-9])[ \t]+(.*)/, "\\2", 1, $1 )
if ( sysFanNu ~ /^([2-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
# note: cpu/mobo/ps/fan1 above are 1/2/3/4
(change version) bug fix in sensors counting and detection.
2009-07-30 00:39:57 +00:00
sysFanNu = sysFanNu + 3
(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
aFanMain[sysFanNu]=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
/^fan([0-9]+)(.*)[ \t]*([0-9]+)[ \t]RPM/ {
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) 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 ( ! sysFanNu in aFanDefault || fanWorking >= aFanDefault[sysFanNu] ) {
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
else if ( temp1 == "" && temp2 == "" && cpuTemp == "" && moboTemp == "" ){
tempFanType=1
}
# 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
}
# 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) 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) 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
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 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
}
}
# now see if you can find the fast little mobo fan, > 5000 rpm and put it as mobo
for (j = 1; j <= indexCountaFanDefault; j++) {
if ( j in aFanDefault && aFanDefault[j] > 5000 && aFanMain[2] == "" ) {
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) 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 construct the sys_fan string for echo
(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
if ( fanMainString == "" && fanDefaultString == "" ) {
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
}
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
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_flags="$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
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
cpu_flags=$( echo "$cpu_flags" | gawk '
new option, show full flags (-f), created a few new functions to split the flag handling, for get and print. This removes that junk from the old get cpu data and makes it cleaner.
2008-11-05 22:23:53 +00:00
BEGIN {
RS=" "
made cpu flag string code more readable
2009-08-03 07:07:31 +00:00
a_ssel["sse"] = 1
a_ssel["sse2"] = 2
a_ssel["pni"] = 3
a_ssel["sse4a"] = 4 # 4a must precede 4
a_ssel["sse4"] = 5
a_ssel["sse5"] = 6
a_sses[1] = "sse"
a_sses[2] = "sse2"
a_sses[3] = "sse3"
a_sses[4] = "sse4a"
a_sses[5] = "sse4"
a_sses[6] = "sse5"
sseCounter = 0
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
}
/^(nx|lm|svm|vmx)$/ {
made cpu flag string code more readable
2009-08-03 07:07:31 +00:00
if ( flag_string != "" ) {
flag_string = flag_string " " $0
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 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
else {
made cpu flag string code more readable
2009-08-03 07:07:31 +00:00
flag_string = $0
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
}
}
tweaked cpu flag short output to handle sse4a and sse4 and sse5
2009-08-03 06:59:17 +00:00
/^(sse|sse2|sse4a|sse4|sse5|pni)$/ {
made cpu flag string code more readable
2009-08-03 07:07:31 +00:00
if ( a_ssel[$0] > sseCounter ) {
sseCounter = a_ssel[$0]
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 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 {
made cpu flag string code more readable
2009-08-03 07:07:31 +00:00
if ( sseCounter > 0 ) {
if ( flag_string != "" ) {
flag_string = a_sses[sseCounter] " " 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
}
else {
made cpu flag string code more readable
2009-08-03 07:07:31 +00:00
flag_string = a_sses[sseCounter]
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
Made all awk code endings the same, }' )... in all cases, or }' /file/path, or whatever
2008-11-06 21:39:18 +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: -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) 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
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
short_data="${C1}CPU$cpc_plural${CN}[${C2}${SEP1}${cpu_data_string} ${cpu_model}$model_plural (${cpu_type}) clocked at ${min_max_clock}${SEP1}${CN}] ${C1}Kernel${CN}[${C2}${SEP1}${current_kernel}${SEP1}${CN}] ${C1}Up${CN}[${C2}${SEP1}${up_time}${SEP1}${CN}] ${C1}Mem${CN}[${C2}${SEP1}${memory}${SEP1}${CN}] ${C1}HDD${CN}[${C2}${SEP1}${hdd_capacity}($hdd_used)${SEP1}${CN}] ${C1}Procs${CN}[${C2}${SEP1}${processes}${SEP1}${CN}]"
(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
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
short_data="${short_data} ${C1}Client${CN}[${C2}${SEP1}${IRC_CLIENT}${IRC_CLIENT_VERSION}${SEP1}${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
fi
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
short_data="${short_data} ${C1}$SCRIPT_NAME${C2}${CN}[${C2}${SEP1}$SCRIPT_VERSION_NUMBER${SEP1}${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 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
local i='' card_one='Card-1' audio_data='' a_audio_data='' port_data=''
Added option, with -x, to show, if available, kernel driver module version number. Note, this is not often available data, so it will only show if you have it. This requires modinfo showing ^version: data, which only sometimes is there.
2008-11-23 18:12:56 +00:00
local a_audio_working='' alsa_driver='' alsa_data='' port_plural='' module_version=''
(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
# port_data=" ${C1}at port${C2} ${a_audio_working[2]}"
# 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
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
module_version=$( print_module_version "${a_audio_working[3]}" )
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
port_data=" ${C1}at port$port_plural${C2} ${a_audio_working[2]}"
fi
(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}$card_one${C2} ${a_audio_working[0]}$alsa_driver$port_data"
(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=''
if [[ -n ${a_audio_working[3]} && $B_EXTRA_DATA == 'true' ]];then
module_version=$( print_module_version "${a_audio_working[3]}" )
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
(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="${C1}driver${C2} ${a_audio_working[1]}"
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
port_data=" ${C1}at port$port_plural${C2} ${a_audio_working[2]}"
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 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}Card-$(( $i + 1 ))${C2} ${a_audio_working[0]}$alsa_driver$port_data"
(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}"
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 [[ $i -gt 10 ]];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
break
fi
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
(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
local gfx_data='' i='' card_one='Card' root_alert=''
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 )"
(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
local b_is_mesa='false' display_full_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
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
if [[ $B_X_RUNNING == 'true' && $B_ROOT != 'true' ]];then
if [[ -z $x_vendor || -z $x_version ]];then
x_vendor='X-Vendor: N/A'
fi
display_full_string="${C1}$x_vendor${C2} $x_version ${C1}Res:${C2} ${screen_resolution} "
else
if [[ $B_X_RUNNING == 'true' && $B_ROOT == 'true' ]];then
root_alert="${C1}Gfx Data:${C2} N/A for root user"
fi
display_full_string="${C1}tty res:${C2} ${screen_resolution} $root_alert"
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
if [[ ${#A_GFX_CARD_DATA[@]} -gt 1 ]];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
i=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
while [[ -n ${A_GFX_CARD_DATA[i]} && $i -le 3 ]]
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
do
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
gfx_data=" ${C1}Card-$(($i+1))${C2} ${A_GFX_CARD_DATA[i]}"
Fixed messup with gfx arrays, mixed up glx and gfx
2008-10-30 07:23:45 +00:00
((i++))
refactored into primary data get and print functions
2008-10-28 04:14:35 +00:00
done
(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-1'
Initial setup of repo
2008-10-28 00:40:43 +00:00
fi
(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
gfx_data=$( create_print_line "Graphics:" "${C1}$card_one${C2} ${A_GFX_CARD_DATA[0]}${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
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_X_RUNNING == 'true' ]] && [[ $b_is_mesa != '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 [[ $B_X_RUNNING == 'true' && $B_ROOT != 'true' ]];then
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
(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
local hdd_data='' hdd_data_2='' a_hdd_working='' hdd_temp_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
local dev_data='' size_data='' hdd_model='' hdd_model_2='' hdd_model_3='' usb_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
(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]}
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 [[ $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"
(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_DISK == 'true' ]];then
Added array item, usb, for advanced hard disk output
2008-11-08 21:56:16 +00:00
if [[ -n ${a_hdd_working[3]} ]];then
Made (usb) to USB to make more readable
2008-11-09 20:28:26 +00:00
usb_data="${a_hdd_working[3]} "
Added array item, usb, for advanced hard disk output
2008-11-08 21:56:16 +00:00
else
usb_data=''
fi
Cleaned up some testing cases, removed and cleaned up comments, tweaked the full hard drive output a bit
2008-11-09 20:20:23 +00:00
dev_data="/dev/${a_hdd_working[0]} "
size_data=" ${a_hdd_working[1]}"
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
(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 [[ $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"
fi
fi
Fixed long line wraps, rearranged hard disk info
2008-11-08 06:06:08 +00:00
# wrap to avoid long lines
(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 [[ $i -gt 1 && $B_SHOW_DISK == 'true' ]] || [[ $i -gt 3 ]];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
hdd_model_2="${hdd_model_2}${hdd_model_2+${C1}$(($i+1)):${C2}} $usb_data$dev_data${a_hdd_working[2]}$size_data$hdd_temp_data "
Fixed long line wraps, rearranged hard disk info
2008-11-08 06:06:08 +00:00
else
(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
hdd_model="${hdd_model}${hdd_model+ ${C1}$(($i+1)):${C2}} $usb_data$dev_data${a_hdd_working[2]}$size_data$hdd_temp_data"
Fixed long line wraps, rearranged hard disk info
2008-11-08 06:06:08 +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
done
if [[ -z $hdd_model ]];then
fixed typo
2008-11-08 06:43:30 +00:00
hdd_model=' None Detected'
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 long line wraps, rearranged hard disk info
2008-11-08 06:06:08 +00:00
if [[ -n $hdd_model_2 ]];then
hdd_data=$( create_print_line "Disks:" "${C1}HDD${C2} ${C1}Total Size:${C2} ${hdd_capacity} (${hdd_used})${hdd_model}" )
hdd_data_2=$( create_print_line " " "${hdd_model_2}${CN}" )
else
hdd_data=$( create_print_line "Disks:" "${C1}HDD${C2} ${C1}Total Size:${C2} ${hdd_capacity} (${hdd_used})${hdd_model}${CN}" )
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}" )
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 "$hdd_data"
Fixed long line wraps, rearranged hard disk info
2008-11-08 06:06:08 +00:00
if [[ -n $hdd_model_2 ]];then
print_screen_output "$hdd_data_2"
fi
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
Correct runlevel check
2008-12-16 23:12:27 +00:00
local suggested_app="runlevel"
(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) 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
# this only triggers if no X data is present
if [[ $B_X_RUNNING != '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
if [[ -e $suggested_app ]];then
Correct runlevel check
2008-12-16 23:12:27 +00:00
runlvl="$( runlevel | gawk '{ print $2 }' )"
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
}
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
# args: $1 - module name (could be > 1, so loop it )
print_module_version()
{
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_versions='' module='' version=''
for module in $1
do
version=$( get_module_version_number $module )
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=''
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 card_string='' port_plural='' module_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
# 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
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_network_working[3]} && $B_EXTRA_DATA == 'true' ]];then
module_version=$( print_module_version "${a_network_working[3]}" )
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
port_data=" ${C1}at 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
(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=''
network_data="${C1}$card_one${C2} ${a_network_working[0]}$driver_data$port_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
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"
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=''
(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
driver_data=''
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=''
if [[ -n ${a_network_working[3]} && $B_EXTRA_DATA == 'true' ]];then
module_version=$( print_module_version "${a_network_working[3]}" )
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
port_data=" ${C1}at port$port_plural${C2} ${a_network_working[2]}"
fi
(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
network_data="${C1}Card-$(( $i + 1 ))${C2} ${a_network_working[0]}$driver_data$port_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
network_data=$( create_print_line " " "$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"
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
}
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=''
# set A_INTERFACES_DATA
get_networking_local_ip_data
# first print output for wan ip line. Null is handled in the get function
ip_data=$( create_print_line " " "${C1}Wan IP:${C2} $ip" )
# then create the list of local interface/ip
interfaces=" ${C1}Interface:${C2}"
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"
if [[ $i -lt 3 ]];then
if [[ -n ${a_interfaces_working[0]} ]];then
interfaces="$interfaces ${C1}${a_interfaces_working[0]}${C2} ${a_interfaces_working[1]}"
fi
else
if [[ -n ${a_interfaces_working[0]} ]];then
# space on end here for lining up with line starter
interfaces_2="$interfaces_2${C1}${a_interfaces_working[0]}${C2} ${a_interfaces_working[1]} "
fi
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=''
bug fix
2009-02-11 18:13:22 +00:00
local part_uuid='' full_uuid='' dev_remote=''
(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) 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) 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
if [[ -n ${a_partition_working[5]} ]];then
added nfs remote mount syntax
2009-02-11 17:51:55 +00:00
if [[ -z $( grep -E '(^//|:/)' <<< ${a_partition_working[5]} ) ]];then
output for remote file systems
2009-02-05 01:59:08 +00:00
part_dev="/dev/${a_partition_working[5]}"
dev_remote='dev'
else
part_dev="${a_partition_working[5]}"
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
(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[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
part_label="${a_partition_working[6]}"
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
(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[7]} ]];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
part_uuid="${a_partition_working[7]}"
else
part_uuid='N/A'
fi
full_uuid=" ${C1}uuid:${C2} $part_uuid"
fi
fi
partitionIdClean=$( sed -r 's|/home/(.*)/(.*)|/home/##/\2|' <<< ${a_partition_working[0]} )
(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
(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_partition_data[$counter]="${a_partition_data[$counter]}${C1}ID:${C2}$partitionIdClean ${C1}size:${C2} ${a_partition_working[1]}$partition_used$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
added logging for -@ 9 and 10, update version
2009-05-28 23:08:18 +00:00
eval $LOGFE
(Change version) New option -p, outputs all discovered partition information along with the -P stuff. -P was improved to also show /tmp and /usr by default. -p will not show with -F to avoid flooding issues.
2008-12-03 23:14:21 +00:00
}
(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) 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
cpu_temp=${A_SENSORS_DATA[0]}
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 )
if [[ -n $gpu_temp ]];then
gpu_temp="${C1}gpu:${C2} ${gpu_temp}C "
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
;;
[3-9])
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
[0-9]|10|11|12|13|14)
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
(change version) Added nvidia/ati-fglrx gpu data output to sensors
2009-08-03 08:11:30 +00:00
temp_data="$cpu_temp$mobo_temp$psu_temp$gpu_temp"
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
temp_data=$( create_print_line "Sensors:" "$temp_data" )
print_screen_output "$temp_data"
# don't print second or subsequent lines if error 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
fan_data="$cpu_fan$mobo_fan$ps_fan$sys_fans"
if [[ $b_is_error != 'true' && -n $fan_data ]];then
(change version) New feature: -s option triggers sensors output, also -F adds it. Shows all that can be gathered, cpu/mobo temp, cpu/mobo/psu fan speed, sys fan speeds. Also cleaned up some non clear code in inxi.
2009-07-28 22:44:21 +00:00
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
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
(Version Change) Added 32/64 bit output on System -S line
2008-12-17 04:09:01 +00:00
local system_data='' bits=''
(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 )"
(Version Change) Added 32/64 bit output on System -S line
2008-12-17 04:09:01 +00:00
# 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
(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="$system_data $current_kernel $bits ${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
}
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