summaryrefslogtreecommitdiffstats
path: root/inxi
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xssn.at>2009-08-28 21:45:56 +0200
committerFlorian Pritz <bluewind@xssn.at>2009-08-28 21:45:56 +0200
commit8fb707db066c730c528c88dd2b4c4b29ef2de6cd (patch)
tree81a53853b5502f3fb6bf74d0a32d11b3ce370000 /inxi
parent477c9e24a2d464f37c5eee90efd58682d9ceb02c (diff)
downloadbin-8fb707db066c730c528c88dd2b4c4b29ef2de6cd.tar.gz
bin-8fb707db066c730c528c88dd2b4c4b29ef2de6cd.tar.xz
upstream update
Signed-off-by: Florian Pritz <bluewind@xssn.at>
Diffstat (limited to 'inxi')
-rw-r--r--[-rwxr-xr-x]inxi1441
1 files changed, 1197 insertions, 244 deletions
diff --git a/inxi b/inxi
index a67f503..f857208 100755..100644
--- a/inxi
+++ b/inxi
@@ -1,13 +1,13 @@
#!/bin/bash
########################################################################
#### Script Name: inxi
-#### version: 1.0.11
-#### Date: 20 March 2009
+#### version: 1.1.13
+#### Date: August 6 2009
########################################################################
#### SPECIAL THANKS
########################################################################
-#### Special thanks to all those in lsc for their tireless dedication
-#### with helping test inxi modules
+#### Special thanks to all those in #lsc and #smxi for their tireless
+#### dedication helping test inxi modules.
########################################################################
#### ABOUT INXI
########################################################################
@@ -61,30 +61,37 @@
########################################################################
#### CONVENTIONS:
#### Indentation: TABS
-#### Do not use `....`, those are totally non-reabable, use $(....)
-#### Do not use one liner flow controls. The ONLY time you should use ; is in
-#### this single case: if [[ condition ]];then (ie, never: [[ condition ]] && statement)
-#### Note: [[ -n $something ]] - double brackets do not require quotes: "$something" for variables
-#### Always use quotes, double or single, for all string values
+#### Do not use `....` (back quotes), those are totally non-reabable, use $(....).
+#### Do not use one liner flow controls.
+#### The ONLY time you should use ';' (semi-colon) is in this single case: if [[ condition ]];then.
+#### Never use compound 'if': ie, if [[ condition ]] && statement.
+#### Note: [[ -n $something ]] - double brackets does not require quotes for variables: ie, "$something".
+#### Always use quotes, double or single, for all string values.
####
#### All new code/methods must be in a function.
-#### 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.
+#### For all boolean tests, use 'true' / 'false'.
+#### !! Do NOT use 0 or 1 unless it's a function return.
+#### Avoid complicated tests in the if condition itself.
+#### To 'return' a value in a function, use 'echo <var>'.
####
#### For gawk: use always if ( num_of_cores > 1 ) { hanging { starter for all blocks
#### This lets us use one method for all gawk structures, including BEGIN/END, if, for, etc
####
#### VARIABLE/FUNCTION NAMING:
-#### All variables should explain what they are, except counters like i, j
-#### All variables MUST be initialized / declared explicitly
-####, globals UPPER CASE, at top of script, SOME_VARIABLE='' (words separated by _ ).
-#### Locals always with: local some_variable= (lower case, words separated by _ )
-#### Locals that will be inherited by child functions: Some_Variable (so you know they are inherited)
-#### and at the top of the function.
+#### 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
####
-#### Booleans should start with b_ or B_ and state clearly what is being tested
-#### Arrays should start with a_ or A_
-#### All functions should follow standard naming, ie, verb adjective noun, get_cpu_data
+#### 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).
####
#### SPECIAL NOTES:
#### The color variable ${C2} must always be followed by a space unless you know what
@@ -94,28 +101,53 @@
#### 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.
+####
+#### As with all 'rules' there are acceptions, these are noted where used.
+####
+###################################################################################
+#### 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
+####
########################################################################
#### Valuable Resources
-#### awk arrays: http://www.math.utah.edu/docs/info/gawk_12.html
+#### gawk arrays: http://www.math.utah.edu/docs/info/gawk_12.html
########################################################################
#### TESTING FLAGS
#### inxi supports advanced testing triggers to do various things, using -! <arg>
-#### -! 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'
+#### -! 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'
#### -! 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
#### -! 13 - triggers an update from svn branch three - if present, of course
#### -! 14 - triggers an update from svn branch four - if present, of course
#### -! <http://......> - Triggers an update from whatever server you list.
+#### 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
########################################################################
#### VARIABLES
########################################################################
## NOTE: we can use hwinfo if it's available in all systems, or most, to get
## a lot more data and verbosity levels going
-
+# set to default LANG to avoid locales errors with , or .
+LANG=C
### Variable initializations: null values
CMDL_MAX=''
COLOR_SCHEME=''
@@ -123,7 +155,7 @@ COLOR_SCHEME_SET=''
IRC_CLIENT=''
IRC_CLIENT_VERSION=''
-### primary data array holders
+### primary data array holders ## usage: 'A_<var>'
A_AUDIO_DATA=''
A_CMDL=''
A_CPU_CORE_DATA=''
@@ -136,9 +168,10 @@ A_HDD_DATA=''
A_INTERFACES_DATA=''
A_NETWORK_DATA=''
A_PARTITION_DATA=''
+A_SENSORS_DATA=''
A_X_DATA=''
-### Boolean true/false globals
+### Boolean true/false globals ## usage: 'B_<var>'
# 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'
@@ -148,17 +181,21 @@ B_CPU_FLAGS_FULL='false'
B_DEBUG_FLOOD='false'
# show extra output data
B_EXTRA_DATA='false'
-B_SHOW_DISK='false'
# override certain errors due to currupted data
B_HANDLE_CORRUPT_DATA='false'
+B_LOG_COLORS='false'
+B_LOG_FULL_DATA='false'
B_ROOT='false'
# Running in a shell? Defaults to false, and is determined later.
B_RUNNING_IN_SHELL='false'
# this sets the debug buffer
B_SCRIPT_UP='false'
+# sensors only if installed
+B_SENSORS='false'
# Show sound card data
B_SHOW_AUDIO='false'
B_SHOW_CPU='false'
+B_SHOW_DISK='false'
# Show full hard disk output
B_SHOW_FULL_HDD='false'
B_SHOW_GRAPHICS='false'
@@ -171,6 +208,7 @@ B_SHOW_NETWORK='false'
# either -v > 3 or -P will show partitions
B_SHOW_PARTITIONS='false'
B_SHOW_PARTITIONS_FULL='false'
+B_SHOW_SENSORS='false'
# triggers only short inxi output
B_SHOW_SHORT_OUTPUT='false'
B_SHOW_SYSTEM='false'
@@ -178,8 +216,12 @@ B_SHOW_UUIDS='false'
# triggers various debugging and new option testing
B_TESTING_1='false'
B_TESTING_2='false'
+# set to true here for debug logging from script start
+B_USE_LOGGING='false'
# Test for X running
B_X_RUNNING='false'
+# test for dbus irc client
+B_DBUS_CLIENT='false'
### Directory/file exist flags; test as [[ $(boolean) ]] not [[ $boolean ]]
B_PROC='false'
@@ -195,21 +237,20 @@ B_MODULES_DIR='false' #
B_MOUNTS_DIR='false'
B_PARTITIONS_DIR='false' #
-### Directory's used when present
-DIR_CPUINFO='/proc/cpuinfo'
-DIR_MEMINFO='/proc/meminfo'
-DIR_ASOUND_DEVICE='/proc/asound/cards'
-DIR_ASOUND_VERSION='/proc/asound/version'
-DIR_LSB_RELEASE='/etc/lsb-release'
-DIR_SCSI='/proc/scsi/scsi'
-DIR_MODULES='/proc/modules' #
-DIR_MOUNTS='/proc/mounts'
-DIR_PARTITIONS='/proc/partitions' #
-DIR_IFCONFIG='/sbin/ifconfig'
+### 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'
### Variable initializations: constants
DCOPOBJ="default"
-DEBUG=0 # Set debug levels from 1-10
+DEBUG=0 # Set debug levels from 1-10 (8-10 trigger logging levels)
# Debug Buffer Index, index into a debug buffer storing debug messages until inxi is 'all up'
DEBUG_BUFFER_INDEX=0
## note: the debugger rerouting to /dev/null has been moved to the end of the get_parameters function
@@ -218,14 +259,29 @@ DEBUG_BUFFER_INDEX=0
# Defaults to 2, make this 1 for normal, 0 for no colorcodes at all. Set to any other valid scheme you like.
# Same as runtime parameter.
DEFAULT_SCHEME=2
+
# Default indentation level
INDENT=10
-# default to false, no konversation found, 1 is /cmd inxi start, 2 is native konvi script mode
+
+# logging eval variables, start and end function: Insert to LOGFS LOGFE when debug level >= 8
+LOGFS_STRING='log_function_data fs $FUNCNAME "$( echo $@ )"'
+LOGFE_STRING='log_function_data fe $FUNCNAME'
+LOGFS=''
+LOGFE=''
+# uncomment for debugging from script start
+# LOGFS=$LOGFS_STRING
+# LOGFE=$LOGFE_STRING
+
+# 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)
KONVI=0
# NO_CPU_COUNT=0 # Wether or not the string "dual" or similar is found in cpuinfo output. If so, avoid dups.
# This is a variable that controls how many parameters inxi will parse in a /proc/<pid>/cmdline file before stopping.
PARAMETER_LIMIT=30
SCHEME=0 # set default scheme
+# 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=''
# SHOW_IRC=1 to avoid showing the irc client version number, or SHOW_IRC=0 to disable client information completely.
SHOW_IRC=2
# Verbosity level defaults to 0, this can also be set with -v0, -v2, -v3, etc as a parameter.
@@ -235,19 +291,24 @@ VERBOSITY_LEVELS=5
# Clear nullglob, because it creates unpredictable situations with IFS=$'\n' ARR=($VAR) IFS="$ORIGINAL_IFS"
# type constructs. Stuff like [rev a1] is now seen as a glob expansion pattern, and fails, and
-# therefore results in nothing. Tricky as fuck.
+# therefore results in nothing.
shopt -u nullglob
## info on bash built in: $IFS - http://tldp.org/LDP/abs/html/internalvariables.html
# Backup the current Internal Field Separator
ORIGINAL_IFS="$IFS"
+
# These two determine separators in single line output, to force irc clients not to break off sections
SEP1='-'
SEP2='~'
-### Script names/paths
+### 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"
SCRIPT_NAME="inxi"
-SCRIPT_PATH=$( dirname $0 )
-SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3}' )
+SCRIPT_PATH="" #filled-in in Main
+SCRIPT_VERSION_NUMBER="" #filled-in in Main
SCRIPT_DOWNLOAD='http://inxi.googlecode.com/svn/trunk/'
SCRIPT_DOWNLOAD_BRANCH_1='http://inxi.googlecode.com/svn/branches/one/'
SCRIPT_DOWNLOAD_BRANCH_2='http://inxi.googlecode.com/svn/branches/two/'
@@ -264,12 +325,13 @@ export LC_ALL
### Output Colors
# A more elegant way to have a scheme that doesn't print color codes (neither ANSI nor mIRC) at all. See below.
unset EMPTY
-# DGREY BLACK RED DRED GREEN DGREEN YELLOW DYELLOW
+# DGREY BLACK RED DRED GREEN DGREEN YELLOW DYELLOW
ANSI_COLORS="       "
IRC_COLORS=" \x0314 \x0301 \x0304 \x0305 \x0309 \x0303 \x0308 \x0307"
-# BLUE DBLUE MAGENTA DMAGENTA CYAN DCYAN WHITE GREY NORMAL
+# BLUE DBLUE MAGENTA DMAGENTA CYAN DCYAN WHITE GREY NORMAL
ANSI_COLORS="$ANSI_COLORS         "
IRC_COLORS=" $IRC_COLORS \x0312 \x0302 \x0313 \x0306 \x0311 \x0310 \x0300 \x0315 \x03"
+
#ANSI_COLORS=($ANSI_COLORS); IRC_COLORS=($IRC_COLORS)
A_COLORS_AVAILABLE=( DGREY BLACK RED DRED GREEN DGREEN YELLOW DYELLOW BLUE DBLUE MAGENTA DMAGENTA CYAN DCYAN WHITE GREY NORMAL )
# See above for notes on EMPTY
@@ -302,15 +364,6 @@ A_CPU_BANS=( @ cpu deca 'dual core' dual-core 'tri core' tri-core 'quad core' qu
BAN_LIST_NORMAL=''
BAN_LIST_CPU=''
-### Source global config overrides
-if [[ -s /etc/$SCRIPT_NAME.conf ]];then
- source /etc/$SCRIPT_NAME.conf
-fi
-# Source user config overrides
-if [[ -s $HOME/.$SCRIPT_NAME ]];then
- source $HOME/.$SCRIPT_NAME
-fi
-
# WARNING: In the main part below (search for 'KONVI')
# there's a check for Konversation-specific config files.
# Any one of these can override the above if inxi is run
@@ -321,25 +374,57 @@ fi
########################################################################
main()
{
- # 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.
+ eval $LOGFS
+
+ # This function just initializes variables
initialize_script_data
- ## this needs to run before the KONVI stuff is set below
- get_start_client
-
- # Check for dependencies before running anything else except above functions
+ # Check for dependencies BEFORE running ANYTHING else except above functions
+ # Not all distro's have these depends installed by default
check_script_depends
check_script_suggested_apps
+ # 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.
+
+ ### 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
+ # Source user config overrides, ~/.inxi/inxi.conf
+ if [[ -s $HOME/.$SCRIPT_NAME/$SCRIPT_NAME.conf ]];then
+ source $HOME/.$SCRIPT_NAME/$SCRIPT_NAME.conf
+ fi
+
+ ## this needs to run before the KONVI stuff is set below
+ ## 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
+
+ get_start_client
+
# note: this only works if it's run from inside konversation as a script builtin or something
- # only do this if inxi has been started as a konversation script, otherwise bypass this
- if [[ $KONVI -eq 1 ]];then
- DCPORT="$1"
- DCSERVER="$2"
- DCTARGET="$3"
- shift 3
+ # 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
+
# 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=":"
@@ -352,6 +437,7 @@ main()
done
IFS="$ORIGINAL_IFS"
fi
+
## leave this for debugging dcop stuff if we get that working
# print_screen_output "DCPORT: $DCPORT"
# print_screen_output "DCSERVER: $DCSERVER"
@@ -369,7 +455,7 @@ main()
# all the pre-start stuff is in place now
B_SCRIPT_UP='true'
script_debugger "Debugger: $SCRIPT_NAME is up and running..."
-
+
# then create the output
print_it_out
@@ -377,7 +463,7 @@ main()
if [[ $B_RUNNING_IN_SHELL == 'true' && $SCHEME -gt 0 ]];then
echo -n ""
fi
-
+ eval $LOGFE
# 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
@@ -391,8 +477,10 @@ main()
# initialize some boleans, these directories are used throughout the script
# some apps are used for extended functions any directory used, should be
# checked here first.
+# No args taken.
initialize_script_data()
{
+ eval $LOGFS
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"
@@ -413,6 +501,7 @@ initialize_script_data()
added_path="$added_path:$path"
fi
done
+
IFS="$ORIGINAL_IFS"
PATH="${PATH}${added_path}"
##echo "PATH='$PATH'"
@@ -430,69 +519,73 @@ initialize_script_data()
error_handler 6
fi
- if [[ -e $DIR_CPUINFO ]]; then
+ if [[ -e $FILE_CPUINFO ]]; then
B_CPUINFO='true'
fi
- if [[ -e $DIR_MEMINFO ]];then
+ if [[ -e $FILE_MEMINFO ]];then
B_MEMINFO='true'
fi
- if [[ -e $DIR_ASOUND_DEVICE ]];then
+ if [[ -e $FILE_ASOUND_DEVICE ]];then
B_ASOUND_CARDS='true'
fi
- if [[ -e $DIR_ASOUND_VERSION ]];then
+ if [[ -e $FILE_ASOUND_VERSION ]];then
B_ASOUND_VERSION='true'
fi
- if [[ -f $DIR_LSB_RELEASE ]];then
+ if [[ -f $FILE_LSB_RELEASE ]];then
B_LSB_DIR='true'
fi
- if [[ -e $DIR_SCSI ]];then
+ if [[ -e $FILE_SCSI ]];then
B_SCSI_DIR='true'
fi
# lack of ifconfig will throw an error only upon it's usage
- if [[ -x ifconfig ]]; then
- B_IFCONFIG='true'
- DIR_IFCONFIG='ifconfig' # change from full path to use $PATH
- elif [[ -x $DIR_IFCONFIG ]];then
+ if [[ -n $( type -p ifconfig ) ]]; then
B_IFCONFIG='true'
else
- A_INTERFACES_DATA=( "Interfaces tool requires missing app: $DIR_IFCONFIG" )
+ A_INTERFACES_DATA=( "Interfaces tool requires missing app: ifconfig" )
+ fi
+
+ if [[ -n $( type -p sensors ) ]];then
+ B_SENSORS='true'
fi
if [[ -n $DISPLAY ]];then
B_X_RUNNING='true'
fi
- if [[ -e $DIR_MODULES ]];then
+ if [[ -e $FILE_MODULES ]];then
B_MODULES_DIR='true'
fi
- if [[ -e $DIR_MOUNTS ]];then
+ if [[ -e $FILE_MOUNTS ]];then
B_MOUNTS_DIR='true'
fi
- if [[ -e $DIR_PARTITIONS ]];then
+ if [[ -e $FILE_PARTITIONS ]];then
B_PARTITIONS_DIR='true'
fi
# gfx output will require this flag
if [[ $( whoami ) == 'root' ]];then
B_ROOT='true'
fi
+ eval $LOGFE
}
+# No args taken.
check_script_suggested_apps()
{
+ eval $LOGFS
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
- # bash version 3.0 is used in Puppy Linux
+ # bash version 3.0 is used in Puppy Linux; it has a known array bug <reference to be placed here>
# versions older than 3.1 don't handle arrays
# distro's using below 2.05b are unknown, released in 2002
if [[ ${bash_array_test[1]} -eq "two" ]];then
@@ -500,17 +593,21 @@ check_script_suggested_apps()
else
script_debugger "Suggestion: update to Bash v3.1 for optimal inxi output"
fi
+ eval $LOGFE
}
# Determine if any of the absolutely necessary tools are absent
+# No args taken.
check_script_depends()
{
+ eval $LOGFS
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"
+ local x_apps="xrandr xdpyinfo glxinfo"
if [[ $B_X_RUNNING == 'true' ]];then
- for app_name in xrandr xdpyinfo glxinfo
+ for app_name in $x_apps
do
app_data=$( type -p $app_name )
if [[ -z $app_data ]];then
@@ -530,6 +627,7 @@ check_script_depends()
error_handler 5 "$app_name"
fi
done
+ eval $LOGFE
}
## note: this is now running inside each gawk sequence directly to avoid exiting gawk
@@ -539,6 +637,7 @@ check_script_depends()
# args: $1 - BAN_LIST_NORMAL/BAN_LIST_CPU; $2 - string to sanitize
sanitize_characters()
{
+ eval $LOGFS
# 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 '"..."'
@@ -552,12 +651,14 @@ sanitize_characters()
gsub(/^ +| +$/,\"\") ## (pipe char) with (nothing)
print ## prints (returns) cleaned input
}"
+ eval $LOGFE
}
# Filter boilerplate & buzzwords.
# args: $1 - quoted: "$@" array of ban terms
make_ban_lists()
{
+ eval $LOGFS
local ban_list=''
# Iterate over $@
## note: this is a weird, non-intuitive method, needs some documentation or rewriting
@@ -577,6 +678,7 @@ make_ban_lists()
done
echo "$ban_list"
+ eval $LOGFS
}
# make_ban_lists "${A_CPU_BANS[@]}";exit
@@ -584,6 +686,7 @@ make_ban_lists()
# args: $1 = <scheme number>|<"none">
set_color_scheme()
{
+ eval $LOGFS
local i='' script_colors='' color_codes=''
if [[ $1 -ge ${#A_COLOR_SCHEMES[@]} ]];then
@@ -608,6 +711,7 @@ set_color_scheme()
C2="${!script_colors[1]}"
CN="${!script_colors[2]}"
# ((COLOR_SCHEME++)) ## note: why is this? ##
+ eval $LOGFE
}
########################################################################
@@ -622,6 +726,7 @@ set_color_scheme()
# args: $1 - error number; $2 - optional, extra information
error_handler()
{
+ eval $LOGFS
local error_message=''
# assemble the error message
@@ -657,6 +762,7 @@ error_handler()
esac
# then print it and exit
print_screen_output "Error $1: $error_message"
+ eval $LOGFE
exit $1
}
@@ -665,6 +771,7 @@ error_handler()
# args: $1 - $@ debugging string text
script_debugger()
{
+ eval $LOGFS
if [[ $B_SCRIPT_UP == 'true' ]];then
# only return if debugger is off and no pre start up errors have occured
if [[ $DEBUG -eq 0 && $DEBUG_BUFFER_INDEX -eq 0 ]];then
@@ -692,12 +799,87 @@ script_debugger()
(( DEBUG_BUFFER_INDEX++ ))
fi
fi
+ 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.
+# $1 type (fs/fe/cat/raw) or logged data; [$2 is $FUNCNAME; [$3 - function args]]
+log_function_data()
+{
+ if [ "$B_USE_LOGGING" == 'true' ];then
+ local logged_data='' spacer=' ' line='----------------------------------------'
+ 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=''
+ ;;
+ 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
+ ;;
+ *)
+ 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
+ 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
+ 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
}
# 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()
{
+ eval $LOGFS
local wget_error=0
print_screen_output "Starting $SCRIPT_NAME self updater."
print_screen_output "Currently running $SCRIPT_NAME version number: $SCRIPT_VERSION_NUMBER"
@@ -724,6 +906,7 @@ script_self_updater()
error_handler 12 "$1"
fi
fi
+ eval $LOGFS
}
#### -------------------------------------------------------------------
@@ -735,6 +918,7 @@ script_self_updater()
# note: dcop does not seem able to handle \n so that's being stripped out and replaced with space.
print_screen_output()
{
+ eval $LOGFS
# the double quotes are needed to avoid losing whitespace in data when certain output types are used
local print_data="$( echo -e "$1" )"
@@ -756,27 +940,38 @@ print_screen_output()
fi
fi
- if [[ $KONVI -eq 1 ]];then
+ if [[ $KONVI -eq 1 ]]; then ## dcop Konversation (<= 1.1 (qt3))
# konvi doesn't seem to like \n characters, it just prints them literally
- print_data="$( tr '\n' ' ' <<< "$print_data" )"
+ $print_data="$( tr '\n' ' ' <<< "$print_data" )"
dcop "$DCPORT" "$DCOPOBJ" say "$DCSERVER" "$DCTARGET" "$print_data"
+
+ 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"
+
else
# the -n is needed to avoid double spacing of output in terminal
echo -ne "$print_data\n"
fi
+ eval $LOGFE
}
## this handles all verbose line construction with indentation/line starter
## args: $1 - null (, actually: " ") or line starter; $2 - line content
create_print_line()
{
+ eval $LOGFS
printf "${C1}%-${INDENT}s${C2} %s" "$1" "$2"
+ eval $LOGFE
}
# this removes newline and pipes.
# args: $1 - string to clean
remove_erroneous_chars()
{
+ eval $LOGFS
## RS is input record separator
## gsub is substitute;
gawk '
@@ -792,6 +987,7 @@ remove_erroneous_chars()
gsub(/^ +| +$/, "") ## (pipe char) with (nothing)
printf $0
}' "$1" ## prints (returns) cleaned input
+ eval $LOGFE
}
#### -------------------------------------------------------------------
@@ -802,9 +998,11 @@ remove_erroneous_chars()
# args: $1 - full script startup args: $@
get_parameters()
{
+ eval $LOGFS
local opt='' wget_test='' update_flags='U!:'
local use_short='true' # this is needed to trigger short output, every v/d/F/line trigger sets this false
+ # <comment here. what is this for?>
if [[ $B_ALLOW_UPDATE == 'false' ]];then
update_flags=''
fi
@@ -812,7 +1010,7 @@ get_parameters()
# 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
- while getopts Ac:CdDfFGhHiIlNpPSuv:Vx%@:${update_flags} opt
+ while getopts Ac:CdDfFGhHiIlNpPsSuv:Vx%@:${update_flags} opt
do
case $opt in
A) B_SHOW_AUDIO='true'
@@ -873,6 +1071,9 @@ get_parameters()
P) B_SHOW_PARTITIONS='true'
use_short='false'
;;
+ s) B_SHOW_SENSORS='true'
+ use_short='false'
+ ;;
S) B_SHOW_SYSTEM='true'
use_short='false'
;;
@@ -908,6 +1109,19 @@ get_parameters()
@) if [[ -n $( egrep "^([1-9]|10)$" <<< $OPTARG ) ]];then
DEBUG=$OPTARG
exec 2>&1
+ # switch on logging only for -@ 8-10
+ if [[ $OPTARG -ge 8 ]];then
+ if [[ $OPTARG -eq 10 ]];then
+ B_LOG_COLORS='true'
+ elif [[ $OPTARG -eq 9 ]];then
+ B_LOG_FULL_DATA='true'
+ fi
+ B_USE_LOGGING='true'
+ # pack the logging data for evals function start/end
+ LOGFS=$LOGFS_STRING
+ LOGFE=$LOGFE_STRING
+ create_rotate_logfiles # create/rotate logfiles before we do anything else
+ fi
else
error_handler 9 "$OPTARG"
fi
@@ -959,6 +1173,7 @@ get_parameters()
if [[ $use_short == 'true' ]];then
B_SHOW_SHORT_OUTPUT='true'
fi
+ eval $LOGFE
}
## print out help menu, not including Testing or Debugger stuff because it's not needed
@@ -993,6 +1208,7 @@ show_options()
print_screen_output "-p Show full partition information (-P plus all other detected partitions)."
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."
+ print_screen_output "-s Show sensors output (if sensors installed/configured): mobo/cpu temp; detected fan speeds."
print_screen_output "-S Show System information: host name, kernel, distro"
print_screen_output "-u Show partition UUIDs. Default: short partition -P. For full -p output, use: -pu (or -plu)."
print_screen_output "-v Script verbosity levels. Verbosity level number is required."
@@ -1002,9 +1218,11 @@ show_options()
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"
- print_screen_output " 5 - For multicore systems, also show per core clock speeds; shows audio card."
+ print_screen_output " 5 - For multicore systems, also shows: per core clock speeds; audio card; full disk data."
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."
+ print_screen_output " Shows hdd temp with disk data if you have hddtemp installed, if you are root OR if you have"
+ print_screen_output " added to /etc/sudoers (sudo v. 1.7 or newer) (path to hddtemp): <username> ALL = NOPASSWD: /usr/sbin/hddtemp"
print_screen_output ""
print_screen_output "Additional Options:"
print_screen_output "-h - this help menu."
@@ -1014,7 +1232,8 @@ show_options()
fi
print_screen_output "-V $SCRIPT_NAME version information. Prints information then exits."
print_screen_output "-% Overrides defective or corrupted data."
- print_screen_output "-@ Triggers debugger output. Requires debugging level 1-10."
+ 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."
if [[ $1 == 'full' ]];then
print_screen_output ""
print_screen_output "Developer and Testing Options (Advanced):"
@@ -1067,8 +1286,10 @@ print_version_info()
# Determine where inxi was run from, set IRC_CLIENT and IRC_CLIENT_VERSION
get_start_client()
{
+ eval $LOGFS
local irc_client_path='' irc_client_path_lower='' non_native_konvi='' i=''
local b_non_native_app='false' pppid='' app_working_name=''
+ local b_qt4_konvi='false'
if tty >/dev/null;then
IRC_CLIENT='Shell'
@@ -1096,17 +1317,57 @@ get_start_client()
# replacing loose detection with tight detection, bugs will be handled with app names
# as they appear.
case $app_working_name in
+ # check for shell first
+ bash|dash|sh)
+ unset IRC_CLIENT_VERSION
+ IRC_CLIENT="Shell wrapper"
+ ;;
+ # now start on irc clients, alphabetically
+ bitchx)
+ IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk '
+ /Version/ {
+ a=tolower($2)
+ gsub(/[()]|bitchx-/,"",a)
+ print a
+ exit
+ }
+ $2 == "version" {
+ a=tolower($3)
+ sub(/bitchx-/,"",a)
+ print a
+ exit
+ }' )"
+ 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"
+ ;;
irssi-text|irssi)
IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
print $2
}' )"
IRC_CLIENT="Irssi"
;;
- konversation)
+ konversation) ## konvi < 1.2 (qt4)
# this is necessary to avoid the dcop errors from starting inxi as a /cmd started script
- if [[ $b_non_native_app == 'true' ]];then
+ if [[ $b_non_native_app == 'true' ]];then ## true negative is confusing
KONVI=2
- else
+ else # if native app
KONVI=1
fi
IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk '
@@ -1148,45 +1409,27 @@ get_start_client()
fi
IRC_CLIENT="Konversation"
;;
- xchat-gnome)
- IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
- print $2
- }' )"
- IRC_CLIENT="X-Chat-Gnome"
- ;;
- xchat)
- IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
+ kopete)
+ IRC_CLIENT_VERSION=" $( kopete -v | gawk '
+ /Kopete:/ {
print $2
- }' )"
- IRC_CLIENT="X-Chat"
- ;;
- 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"
- ;;
- ircii)
- IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
- print $3
}' )"
- IRC_CLIENT="ircII"
+ IRC_CLIENT="Kopete"
;;
- gaim)
- IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
- print $2
- }' )"
- IRC_CLIENT="Gaim"
+ kvirc)
+ IRC_CLIENT_VERSION=" $( $irc_client_path -v 2>&1 | gawk '{
+ for ( i=2; i<=NF; i++) {
+ if ( i == NF ) {
+ print $i
+ }
+ else {
+ printf $i" "
+ }
+ }
+ exit
+ }' )"
+ IRC_CLIENT="KVIrc"
;;
pidgin)
IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
@@ -1233,28 +1476,19 @@ get_start_client()
IRC_CLIENT_VERSION=" $( $irc_client_path -v ) "
IRC_CLIENT="Weechat"
;;
- 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"
+ xchat-gnome)
+ IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
+ print $2
+ }' )"
+ IRC_CLIENT="X-Chat-Gnome"
;;
- kopete)
- IRC_CLIENT_VERSION=" $( kopete -v | gawk '
- /Kopete:/ {
+ xchat)
+ IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
print $2
- exit
}' )"
- IRC_CLIENT="Kopete"
+ IRC_CLIENT="X-Chat"
;;
+ # then do some perl type searches, do this last since it's a wildcard search
perl*|ksirc|dsirc)
unset IRC_CLIENT_VERSION
# KSirc is one of the possibilities now. KSirc is a wrapper around dsirc, a perl client
@@ -1285,11 +1519,8 @@ get_start_client()
IRC_CLIENT="Unknown Perl client"
fi
;;
- bash|dash|sh)
- unset IRC_CLIENT_VERSION
- IRC_CLIENT="Shell wrapper"
- ;;
- *)
+ # then unset, set unknown data
+ *)
IRC_CLIENT="Unknown : ${irc_client_path##*/}"
unset IRC_CLIENT_VERSION
;;
@@ -1298,15 +1529,76 @@ get_start_client()
unset IRC_CLIENT_VERSION
fi
else
- IRC_CLIENT="PPID=\"$PPID\" - empty?"
- unset IRC_CLIENT_VERSION
+ ## 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
fi
+ log_function_data "IRC_CLIENT: $IRC_CLIENT :: IRC_CLIENT_VERSION: $IRC_CLIENT_VERSION :: PPID: $PPID"
+ eval $LOGFE
}
+## 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]}"
+}
+
+# This needs some cleanup and comments, not quite understanding what is happening, although generally output is known
# Parse the null separated commandline under /proc/<pid passed in $1>/cmdline
# args: $1 - $PPID
get_cmdline()
{
+ eval $LOGFS
local i=0 ppid=$1
if [[ ! -e /proc/$ppid/cmdline ]];then
@@ -1329,6 +1621,8 @@ get_cmdline()
fi
fi
CMDL_MAX=$i
+ log_function_data "CMDL_MAX: $CMDL_MAX"
+ eval $LOGFE
}
#### -------------------------------------------------------------------
@@ -1337,6 +1631,7 @@ get_cmdline()
## create array of sound cards installed on system, and if found, use asound data as well
get_audio_data()
{
+ eval $LOGFS
local i='' alsa_data='' alsa_driver='' device_count=''
local usb_proc_file='' array_count='' usb_id='' usb_data=''
@@ -1356,7 +1651,8 @@ get_audio_data()
if ( driver != "" ){
print driver
}
- }' $DIR_ASOUND_DEVICE )
+ }' $FILE_ASOUND_DEVICE )
+ log_function_data 'cat' "$FILE_ASOUND_DEVICE"
fi
# this is to safeguard against line breaks from results > 1, which if inserted into following
@@ -1446,7 +1742,7 @@ get_audio_data()
if ( card != "" ){
print card","driver
}
- }' $DIR_ASOUND_DEVICE ) )
+ }' $FILE_ASOUND_DEVICE ) )
fi
# alsa usb detection by damentz
@@ -1460,6 +1756,7 @@ get_audio_data()
# corresponding line. Finally, strip out commas as they will change the driver :)
usb_id=$( cat $usb_proc_file/usbid )
usb_data=$( lsusb -v 2>/dev/null | grep "$usb_id" )
+ log_function_data 'raw' "usb_data:\n$usb_data"
usb_data=$( gawk '{
gsub( /,/, " ", $0 )
for( i=7; i <= NF; i++ ) {
@@ -1481,10 +1778,13 @@ get_audio_data()
if [[ ${#A_AUDIO_DATA[@]} -eq 0 ]];then
A_AUDIO_DATA[0]='Failed to Detect Sound Card!'
fi
+ log_function_data "A_AUDIO_DATA: ${A_AUDIO_DATA[@]}"
+ eval $LOGFE
}
get_audio_alsa_data()
{
+ eval $LOGFS
local alsa_data=''
# now we'll get the alsa data if the file exists
@@ -1503,15 +1803,19 @@ get_audio_alsa_data()
if ( $0 != "" ){
print $0
}
- }' $DIR_ASOUND_VERSION )
+ }' $FILE_ASOUND_VERSION )
+ log_function_data 'cat' "$FILE_ASOUND_VERSION"
fi
echo "$alsa_data"
+ log_function_data "alsa_data: $alsa_data"
+ eval $LOGFE
}
## create A_CPU_CORE_DATA, currently with two values: integer core count; core string text
## return value cpu core count string, this helps resolve the multi redundant lines of old style output
get_cpu_core_count()
{
+ eval $LOGFS
if [[ $B_CPUINFO == 'true' ]]; then
# load the A_CPU_TYPE_PCNT_CCNT core data array
get_cpu_ht_multicore_smp_data
@@ -1539,11 +1843,14 @@ get_cpu_core_count()
# 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" )
fi
+ log_function_data "A_CPU_CORE_DATA: ${A_CPU_CORE_DATA[@]}"
+ eval $LOGFE
}
## main cpu data collector
get_cpu_data()
{
+ eval $LOGFS
local i='' j='' cpu_array_nu='' a_cpu_working='' multi_cpu='' bits=''
if [[ $B_CPUINFO == 'true' ]];then
@@ -1553,7 +1860,7 @@ get_cpu_data()
IGNORECASE=1
}
# TAKE STRONGER NOTE: \t+ does NOT always work, MUST be [ \t]+
- # TAKE NOTE: \t+ will work for $DIR_CPUINFO, but SOME ARBITRARY FILE used for TESTING might contain SPACES!
+ # TAKE NOTE: \t+ will work for $FILE_CPUINFO, but SOME ARBITRARY FILE used for TESTING might contain SPACES!
# Therefore PATCH to use [ \t]+ when TESTING!
/^processor[ \t]+:/ {
nr = $NF
@@ -1618,18 +1925,23 @@ get_cpu_data()
else {
printf("%s %s\n", max, "Mhz")
}
- }' $DIR_CPUINFO ) )
+ }' $FILE_CPUINFO ) )
+ log_function_data 'cat' "$FILE_CPUINFO"
fi
IFS="$ORIGINAL_IFS"
+ log_function_data "A_CPU_DATA: ${A_CPU_DATA[@]}"
+ eval $LOGFE
# echo getMainCpu: ${[@]}
}
## this is for counting processors and finding HT types
get_cpu_ht_multicore_smp_data()
{
+ eval $LOGFS
# in /proc/cpuinfo
- # if > 1 processor && processor id == core id then Hyperthreaded (HT)
+ # algorithm
+ # if > 1 processor && processor id (physical id) == core id then Hyperthreaded (HT)
# 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)
@@ -1687,7 +1999,7 @@ get_cpu_ht_multicore_smp_data()
# looking at logical processor counts over 1, which means either HT, SMP or MCP
# http://en.wikipedia.org/wiki/Symmetric_multiprocessing
- if ( processor_logical_count > 1 ) {
+ if ( processor_logical_count > 1 && core_count > 1 ) {
if ( processor_logical_count > core_count && physical_cpu_count > 1 ) {
type = "SMP-HT" # could be Xeon/P4 HT dual cpu
}
@@ -1705,15 +2017,17 @@ get_cpu_ht_multicore_smp_data()
}
print type " " physical_cpu_count " " core_count
}
- ' $DIR_CPUINFO
- ) )
+ ' $FILE_CPUINFO ) )
fi
+ log_function_data "A_CPU_TYPE_PCNT_CCNT: ${A_CPU_TYPE_PCNT_CCNT[@]}"
+ eval $LOGFE
}
# for more on distro id, please reference this python thread: http://bugs.python.org/issue1322
## return distro name/id if found
get_distro_data()
{
+ eval $LOGFS
local i='' j='' distro='' distro_file='' a_distro_glob=''
# get the wild carded array of release/version /etc files if present
@@ -1748,13 +2062,15 @@ get_distro_data()
fi
done
fi
-
+ log_function_data "distro_file: $distro_file"
# 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.
+ elif [[ -n $distro_file && -f $FILE_LSB_RELEASE && " $DISTROS_LSB_GOOD" == *" $distro_file "* ]];then
+ distro=$( get_distro_lsb_data )
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
@@ -1802,11 +2118,14 @@ get_distro_data()
fi
echo "$distro"
+ log_function_data "distro: $distro"
+ eval $LOGFE
}
# args: $1 - optional, app, uses the app test, not being used now
get_distro_lsb_data()
{
+ eval $LOGFS
local distro=''
if [[ $B_LSB_DIR == 'true' ]] && [[ $1 != 'app' ]];then
@@ -1839,7 +2158,8 @@ get_distro_lsb_data()
}
END {
print distroId distroRelease distroCodename
- }' $DIR_LSB_RELEASE )
+ }' $FILE_LSB_RELEASE )
+ log_function_data 'cat' "$FILE_LSB_RELEASE"
fi
# this is HORRIBLY slow, but I don't know why, it runs fast in shell
# if [[ -n $( which lsb_release ) && $1 == 'app' ]];then
@@ -1863,11 +2183,61 @@ get_distro_lsb_data()
# fi
echo $distro
+ log_function_data "distro: $distro"
+ eval $LOGFE
+}
+
+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
+ gpuTemp=""
+ gpuTempWorking=""
+ }
+ /Attribute (.*)[0-9]+\.$/ {
+ gsub(/\./, "", $2)
+ if ( $2 ~ /^[0-9]+$/ ) {
+ gpuTemp=gpuTemp $2 "C "
+ }
+ }
+ END {
+ print gpuTemp
+ }'
+ )
+ elif [[ -n $( type -p aticonfig ) ]];then
+# gpu_temp=$( aticonfig --adapter=0 --od-gettemperature | gawk -F ': ' '
+ gpu_temp=$( aticonfig --adapter=all --od-gettemperature | gawk -F ': ' '
+ BEGIN {
+ IGNORECASE=1
+ gpuTemp=""
+ gpuTempWorking=""
+ }
+ /Sensor (.*)[0-9\.]+ / {
+ gpuTempWorking=gensub(/(.*) ([0-9\.]+) (.*)/, "\\2", "1", $2)
+ if ( gpuTempWorking ~ /^[0-9\.]+$/ ) {
+ gpuTemp=gpuTemp gpuTempWorking "C "
+ }
+ }
+ END {
+ print gpuTemp
+ }'
+ )
+ fi
+
+ if [[ -n $gpu_temp ]];then
+ echo $gpu_temp
+ fi
}
## create array of gfx cards installed on system
get_graphics_card_data()
{
+ eval $LOGFS
local i=''
IFS=$'\n'
@@ -1894,11 +2264,14 @@ get_graphics_card_data()
# GFXMEM is UNUSED at the moment, because it shows AGP aperture size, which is not necessarily equal to GFX memory..
# 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]"
+ log_function_data "A_GFX_CARD_DATA: ${A_GFX_CARD_DATA[@]}"
+ eval $LOGFE
}
## create array of glx data
get_graphics_glx_data()
{
+ eval $LOGFS
if [[ $B_X_RUNNING == 'true' && $B_ROOT != 'true' ]];then
IFS=$'\n'
A_GLX_DATA=( $( glxinfo | gawk -F ': ' '
@@ -1951,12 +2324,15 @@ get_graphics_glx_data()
# 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)}}')
fi
+ log_function_data "A_GLX_DATA: ${A_GLX_DATA[@]}"
+ eval $LOGFE
}
## return screen resolution / tty resolution
get_graphics_res_data()
{
- local screen_resolution=''
+ eval $LOGFS
+ local screen_resolution=''
if [[ $B_X_RUNNING == 'true' && $B_ROOT != 'true' ]];then
# Added the two ?'s , because the resolution is now reported without spaces around the 'x', as in
@@ -1987,25 +2363,32 @@ get_graphics_res_data()
}' )
fi
echo "$screen_resolution"
+ log_function_data "screen_resolution: $screen_resolution"
+ eval $LOGFE
}
## for possible future data, not currently used
get_graphics_agp_data()
{
+ eval $LOGFS
local agp_module=''
- if [[ B_MODULES_DIR == 'true' ]];then
+ if [[ $B_MODULES_DIR == 'true' ]];then
## not used currently
agp_module=$( gawk '
/agp/ && !/agpgart/ && $3 > 0 {
print(gensub(/(.*)_agp.*/,"\\1","g",$1))
- }' $DIR_MODULES )
+ }' $FILE_MODULES )
+ log_function_data 'cat' "$FILE_MODULES"
fi
+ log_function_data "agp_module: $agp_module"
+ eval $LOGFE
}
## create array of x vendor/version data
get_graphics_x_data()
{
+ eval $LOGFS
local x_vendor='' x_version=''
if [[ $B_X_RUNNING == 'true' && $B_ROOT != 'true' ]];then
@@ -2025,7 +2408,8 @@ get_graphics_x_data()
# new method added since radeon and X.org and the disappearance of <X server name> version : ...etc
# Later on, the normal textual version string returned, e.g. like: X.Org version: 6.8.2
# A failover mechanism is in place. (if $x_version is empty, the release number is parsed instead)
- x_version=$( xdpyinfo | gawk '/version:/ {
+ x_version=$( xdpyinfo | gawk '
+ /version:/ {
print $NF
}' )
if [[ -z $x_version ]];then
@@ -2046,14 +2430,19 @@ get_graphics_x_data()
#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.
fi
+ log_function_data "A_X_DATA: ${A_X_DATA[@]}"
+ eval $LOGFE
}
# this gets just the raw data, total space/percent used and disk/name/per disk capacity
get_hdd_data_basic()
{
+ eval $LOGFS
local hdd_used=''
-
- hdd_used=$( df --exclude-type=aufs --exclude-type=tmpfs --exclude-type=iso9660 | gawk '
+ 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 '
# also handles odd dm-1 type, from lvm
/^\/dev\/(mapper\/|[hs]d[a-z][0-9]+|dm[-]?[0-9]+)/ {
# this handles the case where the first item is too long
@@ -2085,7 +2474,7 @@ get_hdd_data_basic()
if [[ -z $hdd_used ]];then
hdd_used='na'
fi
-
+ log_function_data "hdd_used: $hdd_used"
# create the initial array strings:
# disk-dev, capacity, name, usb or not
# final item is the total of the disk
@@ -2126,15 +2515,18 @@ get_hdd_data_basic()
else {
print "NA,-" # print an empty array, this will be further handled in the print out function
}
- }' $DIR_PARTITIONS
- ) )
+ }' $FILE_PARTITIONS ) )
+ log_function_data 'cat' "$FILE_PARTITIONS"
fi
IFS="$ORIGINAL_IFS"
+ log_function_data "A_HDD_DATA: ${A_HDD_DATA[@]}"
+ eval $LOGFE
}
## fills out the A_HDD_DATA array with disk names
get_hard_drive_data_advanced()
{
+ eval $LOGFS
local a_temp_working='' a_temp_scsi='' temp_holder='' temp_name='' i='' j=''
local sd_ls_by_id='' ls_disk_by_id=''
@@ -2152,7 +2544,7 @@ get_hard_drive_data_advanced()
else
a_temp_working[2]="Name n/a"
fi
- # these loops are to easily extend the cpu array created in the awk script above with more fields per cpu.
+ # these loops are to easily extend the cpu array created in the gawk script above with more fields per cpu.
for (( j=0; j < ${#a_temp_working[@]}; j++ ))
do
if [[ $j -gt 0 ]];then
@@ -2195,7 +2587,8 @@ get_hard_drive_data_advanced()
print c
}
}
- }' $DIR_SCSI ) )
+ }' $FILE_SCSI ) )
+ log_function_data 'cat' "$FILE_SCSI"
fi
IFS="$ORIGINAL_IFS"
@@ -2225,14 +2618,19 @@ get_hard_drive_data_advanced()
fi
break
else
- a_temp_working[2]="Name n/a"
+ # 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
fi
done
else
a_temp_working[2]="Name n/a"
fi
- # these loops are to easily extend the cpu array created in the awk script above with more fields per cpu.
+ # these loops are to easily extend the cpu array created in the gawk script above with more fields per cpu.
for (( j=0; j < ${#a_temp_working[@]}; j++ ))
do
if [[ $j -gt 0 ]];then
@@ -2245,39 +2643,72 @@ get_hard_drive_data_advanced()
done
unset ls_disk_by_id # and then let's dump the data we don't need
fi
+ log_function_data "A_HDD_DATA: ${A_HDD_DATA[@]}"
+ eval $LOGFE
+}
+
+# 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
+ # only use sudo if not root, -n option requires sudo -V 1.7 or greater. sudo will just error out
+ # which is the safest course here for now, otherwise that interactive sudo password thing is too annoying
+ # important: -n makes it non interactive, no prompt for password
+ if [[ $B_ROOT != 'true' && -n $( which sudo ) ]];then
+ sudo_command='sudo -n '
+ fi
+ # this will fail if regular user and no sudo present, but that's fine, it will just return null
+ 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
}
get_lspci_data()
{
- echo "$( lspci -v | gawk '{
+ eval $LOGFS
+ local lspci_data="$( lspci -v | gawk '{
gsub(/\(prog-if[^)]*\)/,"")
print
}' )"
+
+ echo "$lspci_data"
+ log_function_data 'raw' "lspci_data:\n$lspci_data"
+ eval $LOGFE
}
## return memory used/installed
get_memory_data()
{
+ eval $LOGFS
local memory=''
-
- memory=$( gawk '
- /^MemTotal:/ {
- tot = $2
- }
- /^(MemFree|Buffers|Cached):/ {
- notused+=$2
- }
- END {
- used = tot-notused
- printf("%.1f/%.1fMB\n", used/1024, tot/1024)
- }' $DIR_MEMINFO )
-
+ 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)
+ }' $FILE_MEMINFO )
+ log_function_data 'cat' "$FILE_MEMINFO"
+ fi
echo "$memory"
+ log_function_data "memory: $memory"
+ eval $LOGFE
}
# process and return module version data
get_module_version_number()
{
+ eval $LOGFS
local module_version=''
if [[ -n $( which modinfo ) ]];then
@@ -2295,11 +2726,14 @@ get_module_version_number()
fi
echo "$module_version"
+ log_function_data "module_version: $module_version"
+ eval $LOGFE
}
## create array of network cards
get_networking_data()
{
+ eval $LOGFS
IFS=$'\n'
A_NETWORK_DATA=( $( echo "$Lspci_Data" | gawk '
BEGIN {
@@ -2366,14 +2800,17 @@ get_networking_data()
}
}') )
IFS="$ORIGINAL_IFS"
+ log_function_data "A_NETWORK_DATA: ${A_NETWORK_DATA[@]}"
+ eval $LOGFE
}
get_networking_wan_ip_data()
{
+ eval $LOGFS
local ip=''
# get ip using wget redirect to stdout. This is a clean, text only IP output url.
- ip=$( wget -q -O - http://smxi.org/opt/ip.php | awk -F 'is: ' '{
+ ip=$( wget -q -O - http://smxi.org/opt/ip.php | gawk -F 'is: ' '{
#gsub("\n","",$2")
print $2
}' )
@@ -2382,13 +2819,16 @@ get_networking_wan_ip_data()
ip='None Detected!'
fi
echo "$ip"
+ log_function_data "ip: $ip"
+ eval $LOGFE
}
get_networking_local_ip_data()
{
+ eval $LOGFS
if [[ $B_IFCONFIG == 'true' ]];then
IFS=$'\n'
- A_INTERFACES_DATA=( $( $DIR_IFCONFIG | gawk '
+ A_INTERFACES_DATA=( $( ifconfig | gawk '
BEGIN {
IGNORECASE=1
}
@@ -2427,19 +2867,25 @@ get_networking_local_ip_data()
}') )
IFS="$ORIGINAL_IFS"
fi
+ log_function_data "A_INTERFACES_DATA: ${A_INTERFACES_DATA[@]}"
+ eval $LOGFE
}
get_partition_data()
{
+ eval $LOGFS
#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
-
+ 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"
+
IFS=$'\n'
# sample line: /dev/sda2 ext3 15G 8.9G 4.9G 65% /home
# $NF = partition name; $(NF - 4) = partition size; $(NF - 3) = used, in gB; $(NF - 1) = percent used
## note: by subtracting from the last field number NF, we avoid a subtle issue with LVM df output, where if
## the first field is too long, it will occupy its own line, this way we are getting only the needed data
- A_PARTITION_DATA=( $( df -h -T --exclude-type=aufs --exclude-type=tmpfs --exclude-type=iso9660 | gawk '
+ A_PARTITION_DATA=( $( echo "$main_partition_data" | gawk '
BEGIN {
IGNORECASE=1
}
@@ -2481,7 +2927,7 @@ get_partition_data()
# 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
- $( swapon -s | gawk '
+ $( echo "$swap_data" | gawk '
BEGIN {
swapCounter = 1
}
@@ -2498,11 +2944,14 @@ get_partition_data()
if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]];then
get_partition_data_advanced
fi
+ log_function_data "A_PARTITION_DATA: ${A_PARTITION_DATA[@]}"
+ eval $LOGFE
}
# first get the locations of the mount points for label/uuid detection
get_partition_data_advanced()
{
+ eval $LOGFS
local a_partition_working='' dev_partition_data=''
local dev_disk_label='' dev_disk_uuid='' dev_item='' dev_label='' dev_uuid=''
local mount_point=''
@@ -2513,6 +2962,7 @@ get_partition_data_advanced()
if [[ -d /dev/disk/by-uuid ]];then
dev_disk_uuid="$( ls -l /dev/disk/by-uuid )"
fi
+ log_function_data 'raw' "dev_disk_label:\n$dev_disk_label\n\ndev_disk_uuid:\n$dev_disk_uuid"
if [[ $B_MOUNTS_DIR == 'true' ]];then
for (( i=0; i < ${#A_PARTITION_DATA[@]}; i++ ))
@@ -2573,7 +3023,7 @@ get_partition_data_advanced()
}
}
print partition "," label "," uuid
- }' $DIR_MOUNTS )
+ }' $FILE_MOUNTS )
# echo dev_partition_data: $dev_partition_data
# assemble everything we could get for dev/h/dx, label, and uuid
@@ -2628,17 +3078,326 @@ get_partition_data_advanced()
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
+ log_function_data 'cat' "$FILE_MOUNTS"
fi
+ log_function_data "A_PARTITION_DATA: ${A_PARTITION_DATA[@]}"
+ eval $LOGFE
+}
+
+get_sensors_data()
+{
+ eval $LOGFS
+
+ IFS=$'\n'
+ if [[ $B_SENSORS == 'true' ]];then
+ # note: non-configured sensors gives error message, which we need to redirect to stdout
+ # also, -F ':' no space, since some cases have the data starting right after,like - :1287
+ A_SENSORS_DATA=( $(
+ sensors | gawk -F ':' -v userCpuNo="$SENSORS_CPU_NO" '
+ BEGIN {
+ IGNORECASE=1
+ core0Temp="" # only if all else fails...
+ cpuTemp=""
+ cpuTempReal=""
+ fanWorking=""
+ indexCountaFanMain=0
+ indexCountaFanDefault=0
+ i=""
+ j=""
+ moboTemp=""
+ moboTempReal=""
+ psuTemp=""
+ separator=""
+ sysFanString=""
+ temp1=""
+ temp2=""
+ tempFanType="" # set to 1 or 2
+ tempUnit=""
+ tempWorking=""
+ tempWorkingUnit=""
+ }
+ # dumping the extra + signs after testing for them, nobody has negative temps.
+ # also, note gawk treats ° as a space, so we have to get the C/F data
+ # there are some guesses here, but with more sensors samples it will get closer.
+ # note: using arrays starting at 1 for all fan arrays to make it easier overall
+ # 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.
+ # note that because of charset issues, no tempUnit="°" tempWorkingUnit degree sign
+ # used, but it is required in testing regex to avoid error.
+ /^(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 == "" ){
+ tempUnit=tempWorkingUnit
+ }
+ }
+ /^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 == "" ){
+ tempUnit=tempWorkingUnit
+ }
+ }
+ /^(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 == "" ){
+ tempUnit=tempWorkingUnit
+ }
+ }
+ $1 ~ /^temp1$/ && $2 ~ /^[ \t]*\+([0-9]+)/ {
+ tempWorking=gensub( /[ \t]+\+([0-9\.]+)(.*)/, "\\1", 1, $2 )
+ if ( temp1 == "" || tempWorking > 0 ) {
+ temp1=tempWorking
+ }
+ tempWorkingUnit=gensub( /[ \t]+\+([0-9\.]+)[ \t°]+([CF])(.*)/, "\\2", 1, $2 )
+ if ( tempWorkingUnit ~ /^C|F$/ && tempUnit == "" ){
+ tempUnit=tempWorkingUnit
+ }
+ }
+ $1 ~ /^temp2$/ && $2 ~ /^[ \t]*\+([0-9]+)/ {
+ tempWorking=gensub( /[ \t]+\+([0-9\.]+)(.*)/, "\\1", 1, $2 )
+ if ( temp2 == "" || tempWorking > 0 ) {
+ temp2=tempWorking
+ }
+ tempWorkingUnit=gensub( /[ \t]+\+([0-9\.]+)[ \t°]+([CF])(.*)/, "\\2", 1, $2 )
+ if ( tempWorkingUnit ~ /^C|F$/ && tempUnit == "" ){
+ tempUnit=tempWorkingUnit
+ }
+ }
+
+ # final fallback if all else fails, funtoo user showed sensors putting
+ # temp on wrapped second line, not handled
+ /^(core0|core 0)(.*)\+([0-9]+)(.*)[ \t°](C|F)/ && $2 ~ /^[ \t]*\+([0-9]+)/ {
+ tempWorking=gensub( /[ \t]+\+([0-9\.]+)(.*)/, "\\1", 1, $2 )
+ if ( core0Temp == "" || tempWorking > 0 ) {
+ core0Temp=tempWorking
+ }
+ tempWorkingUnit=gensub( /[ \t]+\+([0-9\.]+)[ \t°]+([CF])(.*)/, "\\2", 1, $2 )
+ if ( tempWorkingUnit ~ /^C|F$/ && tempUnit == "" ){
+ tempUnit=tempWorkingUnit
+ }
+ }
+
+ # note: can be cpu fan:, cpu fan speed:, etc. Some cases have no space before
+ # $2 starts (like so :1234 RPM), so skip that space test in regex
+ /^CPU(.*)[ \t]*([0-9]+)[ \t]RPM/ {
+ aFanMain[1]=gensub( /[ \t]*([0-9]+)[ \t]+(.*)/, "\\1", 1, $2 )
+ }
+ /^(M\/B|MB|SYS)(.*)[ \t]*([0-9]+)[ \t]RPM/ {
+ aFanMain[2]=gensub( /[ \t]*([0-9]+)[ \t]+(.*)/, "\\1", 1, $2 )
+ }
+ /(Power|P\/S|POWER)(.*)[ \t]*([0-9]+)[ \t]RPM/ {
+ aFanMain[3]=gensub( /[ \t]*([0-9]+)[ \t]+(.*)/, "\\1", 1, $2 )
+ }
+
+ /^(AUX|FAN(1)? |CASE(1)? |CHASSIS(1)? )(.*)[ \t]*([0-9]+)[ \t]RPM/ {
+ aFanMain[4]=gensub( /[ \t]*([0-9]+)[ \t]+(.*)/, "\\1", 1, $2 )
+ }
+ /^(FAN([2-9]) |CASE([2-9]) |CHASSIS([2-9]) )(.*)[ \t]*([0-9]+)[ \t]RPM/ {
+ sysFanNu=gensub( /^(FAN|CASE|CHASSIS)([2-9])[ \t]+(.*)/, "\\2", 1, $1 )
+ if ( sysFanNu ~ /^([2-9])$/ ) {
+ # note: cpu/mobo/ps/fan1 above are 1/2/3/4
+ sysFanNu = sysFanNu + 3
+ aFanMain[sysFanNu]=gensub( /[ \t]*([0-9]+)[ \t]+(.*)/, "\\1", 1, $2 )
+ }
+ }
+ /^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]+)$/ ) {
+ # add to array if array index does not exist OR if number is > existing number
+ if ( ! sysFanNu in aFanDefault || fanWorking >= aFanDefault[sysFanNu] ) {
+ aFanDefault[sysFanNu]=fanWorking
+ }
+ }
+ }
+
+ 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 {
+ # 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 ) {
+ 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
+ if ( aFanMain[1] == "" ) {
+ # note, you cannot test for aFanDefault[1] or [2] != ""
+ # because that creates an array item in gawk just by the test itself
+ if ( tempFanType == 1 && 1 in aFanDefault ) {
+ aFanMain[1]=aFanDefault[1]
+ aFanDefault[1]=""
+ }
+ else if ( tempFanType == 2 && 2 in aFanDefault ) {
+ aFanMain[1]=aFanDefault[2]
+ aFanDefault[2]=""
+ }
+ }
+
+ # then we need to get the actual numeric max array count for both fan arrays
+ for (i = 0; i <= 14; i++) {
+ if ( i in aFanMain && i > indexCountaFanMain ) {
+ indexCountaFanMain=i
+ }
+ }
+ for (i = 0; i <= 14; i++) {
+ if ( i in aFanDefault && i > indexCountaFanDefault ) {
+ indexCountaFanDefault=i
+ }
+ }
+
+ # clear out any duplicates. Primary fan real trumps fan working always if same speed
+ 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] = ""
+ }
+ }
+
+ }
+ }
+
+ # now see if you can find the fast little mobo fan, > 5000 rpm and put it as mobo
+ # note that gawk is returning true for some test cases when aFanDefault[j] < 5000
+ # which has to be a gawk bug, unless there is something really weird with arrays
+ # note: 500 > aFanDefault[j] < 1000 is the exact trigger, and if you manually
+ # assign that value below, the > 5000 test works again, and a print of the value
+ # shows the proper value, so the corruption might be internal in awk.
+ # Note: gensub is the culprit I think, assigning type string for range 501-1000 but
+ # type integer for all others, this triggers true for >
+ for (j = 1; j <= indexCountaFanDefault; j++) {
+ if ( j in aFanDefault && int( aFanDefault[j] ) > 5000 && aFanMain[2] == "" ) {
+ aFanMain[2] = aFanDefault[j]
+ aFanDefault[j] = ""
+ # then add one if required for output
+ if ( indexCountaFanMain < 2 ) {
+ indexCountaFanMain = 2
+ }
+ }
+ }
+
+ # then construct the sys_fan string for echo, note that iteration 1
+ # makes: fanDefaultString separator null, ie, no space or ,
+ 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=","
+ }
+
+ # 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
+ if ( cpuTempReal == "" && moboTempReal == "" && aFanMain[1] == "" && aFanMain[2] == "" && aFanMain[3] == "" && fanDefaultString == "" ) {
+ print "No active sensors found. Have you configured your sensors yet?"
+ }
+ else {
+ # 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 == "" ) {
+ fanMainString=","
+ }
+ print fanMainString
+ print fanDefaultString
+ }
+ }
+ '
+ ) )
+ # 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
}
## return uptime string
get_uptime()
{
+ eval $LOGFS
## note: removing gsub(/ /,"",a); to get get space back in there, goes right before print a
- echo $( uptime | gawk '{
+ local uptime_value="$( uptime | gawk '{
a = gensub(/^.*up *([^,]*).*$/,"\\1","g",$0)
print a
- }' )
+ }' )"
+ echo "$uptime_value"
+ log_function_data "uptime_value: $uptime_value"
+ eval $LOGFE
}
#### -------------------------------------------------------------------
@@ -2649,6 +3408,7 @@ get_uptime()
# args: $1 - string to handle; $2 - cpu count
calculate_multicore_data()
{
+ eval $LOGFS
local string_number=$1 string_data=''
if [[ -n $( egrep -i '( mb| kb)' <<< $1 ) ]];then
@@ -2668,52 +3428,63 @@ calculate_multicore_data()
string_number="$string_number "
fi
echo "$string_number$string_data"
+ log_function_data "string_numberstring_data: $string_number$string_data"
+ eval $LOGFE
}
# prints out shortened list of flags, the main ones of interest
# args: $1 - string of cpu flags to process
process_cpu_flags()
{
+ eval $LOGFS
local cpu_flags="$1"
-
+
# nx = AMD stack protection extensions
# lm = Intel 64bit extensions
- # sse, sse2, pni = sse1,2,3 gfx extensions
+ # sse, sse2, pni = sse1,2,3,4,5 gfx extensions
# svm = AMD pacifica virtualization extensions
# vmx = Intel IVT (vanderpool) virtualization extensions
cpu_flags=$( echo "$cpu_flags" | gawk '
BEGIN {
RS=" "
- ssel["sse"] = 1
- ssel["sse2"] = 2
- ssel["pni"] = 3
- sses[1] = "sse"
- sses[2] = "sse2"
- sses[3] = "sse3"
+ 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 = ""
}
/^(nx|lm|svm|vmx)$/ {
- if (s) {
- s = s " " $0
+ if ( flag_string != "" ) {
+ flag_string = flag_string " " $0
}
else {
- s = $0
+ flag_string = $0
}
}
- /^(sse2?|pni)$/ {
- if (ssel[$0] > sse) {
- sse = ssel[$0]
+ /^(sse|sse2|sse4a|sse4|sse5|pni)$/ {
+ if ( a_ssel[$0] > sseCounter ) {
+ sseCounter = a_ssel[$0]
}
}
END {
- if (sse) {
- if (s) {
- s = sses[sse] " " s
+ if ( sseCounter > 0 ) {
+ if ( flag_string != "" ) {
+ flag_string = a_sses[sseCounter] " " flag_string
}
else {
- s = sses[sse]
+ flag_string = a_sses[sseCounter]
}
}
- print s
+ print flag_string
}' )
#grep -oE '\<(nx|lm|sse[0-9]?|pni|svm|vmx)\>' | tr '\n' ' '))
@@ -2721,6 +3492,8 @@ process_cpu_flags()
cpu_flags="-"
fi
echo "$cpu_flags"
+ log_function_data "cpu_flags: $cpu_flags"
+ eval $LOGFE
}
#### -------------------------------------------------------------------
@@ -2731,6 +3504,7 @@ process_cpu_flags()
## main function to print out, master for all sub print functions.
print_it_out()
{
+ eval $LOGFS
# 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
@@ -2760,10 +3534,14 @@ print_it_out()
if [[ $VERBOSITY_LEVEL -ge 4 || $B_SHOW_PARTITIONS == 'true' ]];then
print_partition_data
fi
+ if [[ $VERBOSITY_LEVEL -ge 5 || $B_SHOW_SENSORS == 'true' ]];then
+ print_sensors_data
+ fi
if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_INFO == 'true' ]];then
print_info_data
fi
fi
+ eval $LOGFE
}
#### SHORT OUTPUT PRINT FUNCTION, ie, verbosity 0
@@ -2771,6 +3549,7 @@ print_it_out()
# these will also be loaded in each relevant print function for long output
print_short_data()
{
+ eval $LOGFS
local current_kernel=$( uname -rm ) # | gawk '{print $1,$3,$(NF-1)}' )
local processes="$(( $( ps aux | wc -l ) - 1 ))"
local short_data='' i='' b_background_black='false'
@@ -2851,6 +3630,7 @@ print_short_data()
short_data="${short_data} $NORMAL"
fi
print_screen_output "$short_data"
+ eval $LOGFE
}
#### LINE ITEM PRINT FUNCTIONS
@@ -2858,6 +3638,7 @@ print_short_data()
# print sound card data
print_audio_data()
{
+ eval $LOGFS
local i='' card_one='Card-1' audio_data='' a_audio_data='' port_data=''
local a_audio_working='' alsa_driver='' alsa_data='' port_plural='' module_version=''
# set A_AUDIO_DATA and get alsa data
@@ -2876,7 +3657,7 @@ print_audio_data()
# if [[ -n ${a_audio_working[2]} ]];then
# port_data=" ${C1}at port${C2} ${a_audio_working[2]}"
# fi
- # this should only trigger if the $DIR_ASOUND_DEVICE data is used, not lspci -nn
+ # this should only trigger if the $FILE_ASOUND_DEVICE data is used, not lspci -nn
if [[ -n ${a_audio_working[3]} && $B_EXTRA_DATA == 'true' ]];then
module_version=$( print_module_version "${a_audio_working[3]}" )
fi
@@ -2930,10 +3711,12 @@ print_audio_data()
print_screen_output "$audio_data"
fi
fi
+ eval $LOGFE
}
print_cpu_data()
{
+ eval $LOGFS
local cpu_data='' i='' cpu_clock_speed='' cpu_multi_clock_data=''
local bmip_data='' cpu_cache='' cpu_vendor='' cpu_flags=''
@@ -3035,12 +3818,14 @@ print_cpu_data()
if [[ $B_CPU_FLAGS_FULL == 'true' ]];then
print_cpu_flags_full "${a_cpu_working[3]}"
fi
+ eval $LOGFE
}
# takes list of all flags, split them and prints x per line
# args: $1 - cpu flag string
print_cpu_flags_full()
{
+ eval $LOGFS
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=''
@@ -3065,10 +3850,12 @@ print_cpu_flags_full()
flag_data=$( create_print_line " " "$line_starter${a_cpu_flags[$i]}" )
print_screen_output "$flag_data"
done
+ eval $LOGFE
}
print_gfx_data()
{
+ eval $LOGFS
local gfx_data='' i='' card_one='Card' root_alert=''
local screen_resolution="$( get_graphics_res_data )"
local b_is_mesa='false' display_full_string=''
@@ -3138,12 +3925,14 @@ print_gfx_data()
fi
print_screen_output "$gfx_data"
fi
+ eval $LOGFE
}
print_hard_disk_data()
{
- local hdd_data='' hdd_data_2='' a_hdd_working=''
- local dev_data='' size_data='' hdd_model='' hdd_model_2='' hdd_model_3='' usb_data=''
+ eval $LOGFS
+ local hdd_data='' hdd_data_2='' a_hdd_working='' hdd_temp_data='' hdd_string=''
+ local dev_data='' size_data='' hdd_model='' usb_data='' hdd_name='' divisor=5
# load A_HDD_DATA
get_hdd_data_basic
@@ -3156,7 +3945,7 @@ print_hard_disk_data()
local hdd_capacity=${a_hdd_basic_working[0]}
local hdd_used=${a_hdd_basic_working[1]}
- if [[ $VERBOSITY_LEVEL -ge 3 ]] || [[ $B_SHOW_DISK == 'true' ]];then
+ if [[ $VERBOSITY_LEVEL -ge 3 || $B_SHOW_DISK == 'true' ]];then
## 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++ ))
@@ -3165,7 +3954,7 @@ print_hard_disk_data()
IFS=","
a_hdd_working=( ${A_HDD_DATA[i]} )
IFS="$ORIGINAL_IFS"
- if [[ $B_SHOW_DISK == 'true' ]];then
+ if [[ $B_SHOW_DISK == 'true' || $VERBOSITY_LEVEL -ge 5 ]];then
if [[ -n ${a_hdd_working[3]} ]];then
usb_data="${a_hdd_working[3]} "
else
@@ -3173,35 +3962,53 @@ print_hard_disk_data()
fi
dev_data="/dev/${a_hdd_working[0]} "
size_data=" ${a_hdd_working[1]}"
+ if [[ $B_EXTRA_DATA == 'true' && -n $dev_data ]];then
+ hdd_temp_data=$( get_hdd_temp_data "$dev_data" )
+ # error handling is done in get data function
+ if [[ -n $hdd_temp_data ]];then
+ hdd_temp_data=" ${hdd_temp_data}C"
+ else
+ hdd_temp_data=''
+ fi
+ fi
+ divisor=2 # for modulus line print out, either 2 items for full, or default for short
fi
- # wrap to avoid long lines
-
- if [[ $i -gt 1 && $B_SHOW_DISK == 'true' ]] || [[ $i -gt 3 ]];then
- hdd_model_2="${hdd_model_2}${hdd_model_2+${C1}$(($i+1)):${C2}} $usb_data$dev_data${a_hdd_working[2]}$size_data "
- else
- hdd_model="${hdd_model}${hdd_model+ ${C1}$(($i+1)):${C2}} $usb_data$dev_data${a_hdd_working[2]}$size_data"
- fi
+ hdd_name="${a_hdd_working[2]}"
+ hdd_string="$usb_data$dev_data$hdd_name$size_data$hdd_temp_data"
+ hdd_model="${hdd_model}${C1}$(($i+1)):${C2} $hdd_string "
+ # printing line one, then new lines according to $divisor setting, and after, if leftovers, print that line.
+ case $i in
+ 0)
+ hdd_data=$( create_print_line "Disks:" "${C1}HDD${C2} ${C1}Total Size:${C2} ${hdd_capacity} (${hdd_used}) ${hdd_model}" )
+ print_screen_output "$hdd_data"
+ hdd_model=''
+ ;;
+ *)
+ # using modulus here, if divisible by $divisor, print line, otherwise skip
+ if [[ $(( $i % $divisor )) -eq 0 ]];then
+ hdd_data=$( create_print_line " " "${hdd_model}${CN}" )
+ print_screen_output "$hdd_data"
+ hdd_model=''
+ fi
+ ;;
+ esac
done
- if [[ -z $hdd_model ]];then
- hdd_model=' None Detected'
- fi
- 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}" )
+ # then print any leftover items
+ if [[ -n $hdd_model ]];then
+ hdd_data=$( create_print_line " " "${hdd_model}${CN}" )
+ print_screen_output "$hdd_data"
fi
else
hdd_data=$( create_print_line "Disks:" "${C1}HDD Total Size:${C2} ${hdd_capacity} (${hdd_used})${CN}" )
+ print_screen_output "$hdd_data"
fi
- print_screen_output "$hdd_data"
- if [[ -n $hdd_model_2 ]];then
- print_screen_output "$hdd_data_2"
- fi
+
+ eval $LOGFE
}
print_info_data()
{
+ eval $LOGFS
local suggested_app="runlevel"
local info_data=''
local runlvl=''
@@ -3230,11 +4037,13 @@ print_info_data()
info_data="${info_data} ${NORMAL}"
fi
print_screen_output "$info_data"
+ eval $LOGFE
}
# args: $1 - module name (could be > 1, so loop it )
print_module_version()
{
+ eval $LOGFS
local module_versions='' module='' version=''
for module in $1
@@ -3248,10 +4057,12 @@ print_module_version()
if [[ -n $module_versions ]];then
echo " ${C1}v:${C2}$module_versions"
fi
+ eval $LOGFE
}
print_networking_data()
{
+ eval $LOGFS
local i='' card_one='Card-1' network_data='' a_network_working='' port_data='' driver_data=''
local card_string='' port_plural='' module_version=''
# set A_NETWORK_DATA
@@ -3313,10 +4124,12 @@ print_networking_data()
if [[ $B_SHOW_IP == 'true' ]];then
print_networking_ip_data
fi
+ eval $LOGFE
}
print_networking_ip_data()
{
+ eval $LOGFS
local ip=$( get_networking_wan_ip_data )
local ip_data='' a_interfaces_working='' interfaces='' interfaces_2='' i=''
@@ -3351,10 +4164,12 @@ print_networking_ip_data()
interfaces_2=$( create_print_line " " "$interfaces_2" )
print_screen_output "$interfaces_2"
fi
+ eval $LOGFE
}
print_partition_data()
{
+ eval $LOGFS
local a_partition_working='' partition_used='' partition_data=''
local counter=0 line_max=160 i=0 a_partition_data='' line_starter=''
local partitionIdClean='' part_dev='' full_dev='' part_label='' full_label=''
@@ -3441,10 +4256,147 @@ print_partition_data()
partition_data=$( create_print_line "$line_starter" "${a_partition_data[$i]}" )
print_screen_output "$partition_data"
done
+ eval $LOGFE
+}
+
+print_sensors_data()
+{
+ eval $LOGFS
+ local mobo_temp='' cpu_temp='' psu_temp='' cpu_fan='' mobo_fan='' ps_fan='' sys_fans='' sys_fans2=''
+ local temp_data='' fan_data='' fan_data2='' b_is_error='false' fan_count=0 gpu_temp=''
+ local a_sensors_working=''
+ get_sensors_data
+
+ IFS=","
+ a_sensors_working=( ${A_SENSORS_DATA[0]} )
+ IFS="$ORIGINAL_IFS"
+ # 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.
+ if [[ ${#a_sensors_working[@]} -eq 1 ]];then
+ cpu_temp="${C1}Error:${C2} ${A_SENSORS_DATA[0]}"
+ b_is_error='true'
+ else
+ for (( i=0; i < ${#A_SENSORS_DATA[@]}; i++ ))
+ do
+ IFS=","
+ a_sensors_working=( ${A_SENSORS_DATA[i]} )
+ IFS="$ORIGINAL_IFS"
+ case $i in
+ # first the temp data
+ 0)
+ if [[ -n ${a_sensors_working[0]} ]];then
+ cpu_temp=${a_sensors_working[0]}
+ else
+ cpu_temp='N/A'
+ fi
+ cpu_temp="${C1}System Temperatures: cpu:${C2} $cpu_temp "
+
+ if [[ -n ${a_sensors_working[1]} ]];then
+ mobo_temp=${a_sensors_working[1]}
+ else
+ mobo_temp='N/A'
+ fi
+ mobo_temp="${C1}mobo:${C2} $mobo_temp "
+
+ if [[ -n ${a_sensors_working[2]} ]];then
+ psu_temp="${C1}psu:${C2} ${a_sensors_working[2]} "
+ fi
+ gpu_temp=$( get_gpu_temp_data )
+ if [[ -n $gpu_temp ]];then
+ gpu_temp="${C1}gpu:${C2} ${gpu_temp} "
+ fi
+ ;;
+ # 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
+ ps_fan="${C1}psu:${C2} ${a_sensors_working[2]} "
+ (( 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
+ ;;
+ 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
+ ;;
+ esac
+ done
+ fi
+ # turning off all output for case where no sensors detected or no sensors output
+ # unless -s used explicitly. So for -F type output won't show unless valid or -! 1 used
+ if [[ $b_is_error != 'true' || $B_SHOW_SENSORS == 'true' || $B_TESTING_1 == 'true' ]];then
+ temp_data="$cpu_temp$mobo_temp$psu_temp$gpu_temp"
+ temp_data=$( create_print_line "Sensors:" "$temp_data" )
+ print_screen_output "$temp_data"
+ # don't print second or subsequent lines if error data
+ fan_data="$cpu_fan$mobo_fan$ps_fan$sys_fans"
+ if [[ $b_is_error != 'true' && -n $fan_data ]];then
+ fan_data=$( create_print_line " " "$fan_data" )
+ print_screen_output "$fan_data"
+ # and then second wrapped fan line if needed
+ if [[ -n $sys_fans2 ]];then
+ fan_data2=$( create_print_line " " "$sys_fans2" )
+ print_screen_output "$fan_data2"
+ fi
+ fi
+ fi
+ eval $LOGFE
}
print_system_data()
{
+ eval $LOGFS
local system_data='' bits=''
local host_name=$( hostname )
local current_kernel=$( uname -rm ) # | gawk '{print $1,$3,$(NF-1)}' )
@@ -3463,6 +4415,7 @@ print_system_data()
fi
system_data="$system_data $current_kernel $bits ${C1}Distro${C2} $distro"
print_screen_output "$system_data"
+ eval $LOGFE
}
########################################################################