mirror of
https://github.com/smxi/inxi.git
synced 2024-11-17 00:31:19 +00:00
removed unneeded swap data, no version change
This commit is contained in:
parent
fec6480dd9
commit
16fa7f0319
14
inxi
14
inxi
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
########################################################################
|
||||
#### Script Name: inxi
|
||||
#### version: 1.0.4-b1-t1
|
||||
#### version: 1.0.4-b1-t2
|
||||
#### Date: 1 March 2009
|
||||
########################################################################
|
||||
#### SPECIAL THANKS
|
||||
|
@ -3257,7 +3257,7 @@ print_networking_ip_data()
|
|||
|
||||
print_partition_data()
|
||||
{
|
||||
local a_partition_working='' partition_used='' swap='' partition_data=''
|
||||
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=''
|
||||
local part_uuid='' full_uuid='' dev_remote=''
|
||||
|
@ -3284,17 +3284,13 @@ print_partition_data()
|
|||
IFS="$ORIGINAL_IFS"
|
||||
full_label=''
|
||||
full_uuid=''
|
||||
if [[ $B_SHOW_PARTITIONS_FULL == 'true' ]] || [[ ${a_partition_working[4]} == 'swap' || ${a_partition_working[4]} == 'main' ]];then
|
||||
if [[ $B_SHOW_PARTITIONS_FULL == 'true' ]] || [[ ${a_partition_working[4]} == 'main' ]];then
|
||||
if [[ -n ${a_partition_working[2]} ]];then
|
||||
partition_used=" ${C1}used:${C2} ${a_partition_working[2]} (${a_partition_working[3]})"
|
||||
else
|
||||
partition_used='' # reset partition used to null
|
||||
fi
|
||||
if [[ ${a_partition_working[4]} == 'swap' ]];then
|
||||
swap=" ${C1}swap:${C2}"
|
||||
else
|
||||
swap=''
|
||||
fi
|
||||
|
||||
# don't show user names in output
|
||||
if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]];then
|
||||
if [[ -n ${a_partition_working[5]} ]];then
|
||||
|
@ -3328,7 +3324,7 @@ print_partition_data()
|
|||
fi
|
||||
partitionIdClean=$( sed -r 's|/home/(.*)/(.*)|/home/##/\2|' <<< ${a_partition_working[0]} )
|
||||
# because these lines can vary widely, using dynamic length handling here
|
||||
a_partition_data[$counter]="${a_partition_data[$counter]}${C1}ID:${C2}$swap$partitionIdClean ${C1}size:${C2} ${a_partition_working[1]}$partition_used$full_dev$full_label$full_uuid "
|
||||
a_partition_data[$counter]="${a_partition_data[$counter]}${C1}ID:${C2}$partitionIdClean ${C1}size:${C2} ${a_partition_working[1]}$partition_used$full_dev$full_label$full_uuid "
|
||||
|
||||
if [[ $( wc -c <<< ${a_partition_data[$counter]} ) -gt $line_max ]];then
|
||||
((counter++))
|
||||
|
|
Loading…
Reference in a new issue