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

updated to fix some dutchy issues

Browse source
This commit is contained in:
inxi-svn 2008-11-21 19:03:26 +00:00
parent e8e35000b1
commit cf29f83108
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 0.6.0-b1-t6 #### version: 0.6.0-b1-t7
#### Date: November 20 2008 #### Date: November 20 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
@ -1789,7 +1789,7 @@ get_partition_data()
## note: by subtracting from the last field number NF, we avoid a subtle issue with LVM df output, where if ## 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 ## 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 | gawk ' A_PARTITION_DATA=( $( df -h -T | gawk '
/\/$|\/boot$|\/var$|\/home$/ { /\/$|\/boot$|\/var$|\/home$/ && ! /aufs/ {
print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1)
}' ) }' )
# now add the swap partition data, doesn't show percent used, someone can figure that in the future # now add the swap partition data, doesn't show percent used, someone can figure that in the future
@ -2382,7 +2382,8 @@ print_info_data()
print_networking_data() print_networking_data()
{ {
local i='' card_one='Card-1 ' network_data='' a_network_working='' port_data='' driver_data='' local i='' card_one='Card-1' network_data='' a_network_working='' port_data='' driver_data=''
local card_string=''
# set A_NETWORK_DATA # set A_NETWORK_DATA
get_networking_data get_networking_data
@ -2392,7 +2393,7 @@ print_networking_data()
if [[ -n ${A_NETWORK_DATA[@]} ]];then if [[ -n ${A_NETWORK_DATA[@]} ]];then
if [[ ${#A_NETWORK_DATA[@]} -le 1 ]];then if [[ ${#A_NETWORK_DATA[@]} -le 1 ]];then
card_one='Card ' card_one='Card'
fi fi
if [[ -n ${a_network_working[1]} ]];then if [[ -n ${a_network_working[1]} ]];then
@ -2401,7 +2402,8 @@ print_networking_data()
if [[ -n ${a_network_working[2]} && $B_EXTRA_DATA == 'true' ]];then if [[ -n ${a_network_working[2]} && $B_EXTRA_DATA == 'true' ]];then
port_data=" ${C1}at port${C2} ${a_network_working[2]}" port_data=" ${C1}at port${C2} ${a_network_working[2]}"
fi fi
network_data="${C1}$card_one${C2}${a_network_working[0]}$driver_data$port_data" card_string=""
network_data="${C1}$card_one${C2} ${a_network_working[0]}$driver_data$port_data"
network_data=$( create_print_line "Network:" "$network_data" ) network_data=$( create_print_line "Network:" "$network_data" )
print_screen_output "$network_data" print_screen_output "$network_data"
i=0 ## loop starts with 1 by auto-increment so it only shows cards > 1 i=0 ## loop starts with 1 by auto-increment so it only shows cards > 1