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

(Version Change)

Browse source 
Added 32/64 bit output on System -S line
This commit is contained in:
inxi-svn 2008-12-17 04:09:01 +00:00
parent 18a41b9c0a
commit 949dea7af1
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 0.8.10 #### version: 0.8.11
#### Date: December 16 2008 #### Date: December 16 2008
######################################################################## ########################################################################
#### inxi is a fork of infobash 3.02, the original bash sys info script by locsmif #### inxi is a fork of infobash 3.02, the original bash sys info script by locsmif
@ -198,7 +198,7 @@ SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | gawk
SCRIPT_DOWNLOAD='http://inxi.googlecode.com/svn/trunk/' SCRIPT_DOWNLOAD='http://inxi.googlecode.com/svn/trunk/'
SCRIPT_DOWNLOAD_BRANCH_1='http://inxi.googlecode.com/svn/branches/one/' SCRIPT_DOWNLOAD_BRANCH_1='http://inxi.googlecode.com/svn/branches/one/'
SCRIPT_DOWNLOAD_BRANCH_2='http://inxi.googlecode.com/svn/branches/two/' SCRIPT_DOWNLOAD_BRANCH_2='http://inxi.googlecode.com/svn/branches/two/'
SCRIPT_DOWNLOAD_DEV='http://techpatterns.com/downloads/distro/' SCRIPT_DOWNLOAD_DEV='http://smxi.org/test/'
KONVI_CFG="konversation/scripts/$SCRIPT_NAME.conf" # relative path to $(kde-config --path data) KONVI_CFG="konversation/scripts/$SCRIPT_NAME.conf" # relative path to $(kde-config --path data)
### Script Localization ### Script Localization
@ -1223,10 +1223,10 @@ get_cpu_core_count()
## main cpu data collector ## main cpu data collector
get_cpu_data() get_cpu_data()
{ {
local i='' j='' cpu_array_nu='' a_cpu_working='' multi_cpu='' local i='' j='' cpu_array_nu='' a_cpu_working='' multi_cpu='' bits=''
IFS=$'\n' IFS=$'\n'
A_CPU_DATA=($(gawk -F': ' ' A_CPU_DATA=($(gawk -v -F': ' '
{ IGNORECASE=1 } { IGNORECASE=1 }
# TAKE NOTE: \t+ will work for /proc/cpuinfo, but SOME ARBITRARY FILE used for TESTING might contain SPACES! # TAKE NOTE: \t+ will work for /proc/cpuinfo, but SOME ARBITRARY FILE used for TESTING might contain SPACES!
# Therefore PATCH to use [ \t]+ when TESTING! # Therefore PATCH to use [ \t]+ when TESTING!
@ -2692,17 +2692,23 @@ print_partition_data()
print_system_data() print_system_data()
{ {
local system_data='' local system_data='' bits=''
local host_name=$( hostname ) local host_name=$( hostname )
local current_kernel=$( uname -a | gawk '{print $1,$3,$(NF-1)}' ) local current_kernel=$( uname -a | gawk '{print $1,$3,$(NF-1)}' )
local distro="$( get_distro_data )" local distro="$( get_distro_data )"
# check for 64 bit first
if [ -n "$( uname -m | grep -o 'x86_64' )" ];then
bits="(64 bit)"
else
bits="(32 bit)"
fi
if [[ $B_SHOW_HOST == 'true' ]];then if [[ $B_SHOW_HOST == 'true' ]];then
system_data=$( create_print_line "System:" "${C1}Host${C2} $host_name ${C1}running${C2} ${CN}" ) system_data=$( create_print_line "System:" "${C1}Host${C2} $host_name ${C1}running${C2}" )
else else
system_data=$( create_print_line "System:" "${C1}running${C2} ${CN}" ) system_data=$( create_print_line "System:" "${C1}running${C2} ${CN}" )
fi fi
system_data="$system_data ${C2}$current_kernel ${C1}Distro${C2} $distro ${CN}" system_data="$system_data ${C2}$current_kernel $bits ${C1}Distro${C2} $distro"
print_screen_output "$system_data" print_screen_output "$system_data"
} }