dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2025-01-19 08:57:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated get_cpu_core_count to return an array of data like other functions, this helps make methods more consistent over

Browse source 
all get data functions
This commit is contained in:
inxi-svn 2008-11-04 22:08:46 +00:00
parent b11b8228c5
commit 582c6eecac
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 0.3.18 #### version: 0.3.19
#### Date: November 4 2008 #### Date: November 4 2008
######################################################################## ########################################################################
#### inxi is a fork of infobash, the original bash sys info script by locsmif #### inxi is a fork of infobash, the original bash sys info script by locsmif
@ -56,6 +56,7 @@ IRC_CLIENT_VERSION=''
### primary data array holders ### primary data array holders
A_AUDIO_DATA='' A_AUDIO_DATA=''
A_CMDL='' A_CMDL=''
A_CPU_CORE_DATA=''
A_CPU_DATA='' A_CPU_DATA=''
A_GFX_CARD_DATA='' A_GFX_CARD_DATA=''
A_GLX_DATA='' A_GLX_DATA=''
@ -759,6 +760,7 @@ get_audio_data()
fi fi
} }
## 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 ## return value cpu core count string, this helps resolve the multi redundant lines of old style output
get_cpu_core_count() get_cpu_core_count()
{ {
@ -768,7 +770,7 @@ get_cpu_core_count()
if [ "$cpu_core_count" -eq 0 ];then if [ "$cpu_core_count" -eq 0 ];then
cpu_core_count=$(grep -ic "^processor" /proc/cpuinfo| cut -d':' -f2) cpu_core_count=$(grep -ic "^processor" /proc/cpuinfo| cut -d':' -f2)
fi fi
local cpu_alpha_count='' core_count='' local cpu_alpha_count=''
if [[ $cpu_core_count -lt 2 ]]; then if [[ $cpu_core_count -lt 2 ]]; then
cpu_core_count=1 cpu_core_count=1
@ -788,9 +790,8 @@ get_cpu_core_count()
10) cpu_alpha_count='Deca';; 10) cpu_alpha_count='Deca';;
*) cpu_alpha_count='Multi';; *) cpu_alpha_count='Multi';;
esac esac
## we'll be splitting the output to number of cores/core count string # create array, core count integer; core count string
core_count="$cpu_core_count:$cpu_alpha_count Core" A_CPU_CORE_DATA=( "$cpu_core_count" "$cpu_alpha_count Core" )
echo "$core_count"
} }
## working, will be replaced by new trash80 stuff ## working, will be replaced by new trash80 stuff
@ -1655,8 +1656,10 @@ print_it_out()
## note: remember that in bash, child functions inherit local variables ## note: remember that in bash, child functions inherit local variables
local current_kernel=$( uname -a | gawk '{print $1,$3,$(NF-1)}' ) local current_kernel=$( uname -a | gawk '{print $1,$3,$(NF-1)}' )
local processes="$(( $( ps aux | wc -l ) - 1 ))" local processes="$(( $( ps aux | wc -l ) - 1 ))"
local cpu_core_count_string="$( get_cpu_core_count | cut -d ':' -f 2 )" # set A_CPU_CORE_DATA
local cpu_core_count="$( get_cpu_core_count | cut -d ':' -f 1 )" get_cpu_core_count
local cpu_core_count_string="${A_CPU_CORE_DATA[1]}"
local cpu_core_count=${A_CPU_CORE_DATA[0]}
local lspci_data='' ## only for verbose needed local lspci_data='' ## only for verbose needed
local up_time="$( get_uptime )" local up_time="$( get_uptime )"
## assemble data for output ## assemble data for output