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

(change version)

Browse source 
added partition fs type output
This commit is contained in:
inxi-svn 2009-10-10 03:50:32 +00:00
parent 3a91faffee
commit 3ae77ae353
1 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
inxi
View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 1.1.13 #### version: 1.1.14
#### Date: August 6 2009 #### Date: October 9 2009
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -2904,7 +2904,7 @@ get_partition_data()
# this handles yet another fredforfaen special case where a mounted drive # this handles yet another fredforfaen special case where a mounted drive
# has the search string in its name # has the search string in its name
$NF ~ /^\/$|^\/boot$|^\/var$|^\/home$|^\/tmp$|^\/usr$/ { $NF ~ /^\/$|^\/boot$|^\/var$|^\/home$|^\/tmp$|^\/usr$/ {
print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",main," devBase print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",main," $(NF - 5) "," devBase
} }
# skip all these, including the first, header line. Use the --exclude-type # skip all these, including the first, header line. Use the --exclude-type
# to handle new filesystems types we do not want listed here # to handle new filesystems types we do not want listed here
@ -2913,14 +2913,14 @@ get_partition_data()
# the test show the wrong data in each of the fields, if no x%, then do not use # the test show the wrong data in each of the fields, if no x%, then do not use
# using 3 cases, first default, standard, 2nd, 3rd, handles one and two spaces in name # using 3 cases, first default, standard, 2nd, 3rd, handles one and two spaces in name
if ( $(NF - 1) ~ /[0-9]+\%/ ) { if ( $(NF - 1) ~ /[0-9]+\%/ ) {
print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",secondary," devBase print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",secondary," $(NF - 5) "," devBase
} }
# these two cases construct the space containing name # these two cases construct the space containing name
else if ( $(NF - 2) ~ /[0-9]+\%/ ) { else if ( $(NF - 2) ~ /[0-9]+\%/ ) {
print $(NF - 1) " " $NF "," $(NF - 5) "," $(NF - 4) "," $(NF - 2) ",secondary," devBase print $(NF - 1) " " $NF "," $(NF - 5) "," $(NF - 4) "," $(NF - 2) ",secondary," $(NF - 6) "," devBase
} }
else if ( $(NF - 3) ~ /[0-9]+\%/ ) { else if ( $(NF - 3) ~ /[0-9]+\%/ ) {
print $(NF - 2) " " $(NF - 1) " " $NF "," $(NF - 6) "," $(NF - 5) "," $(NF - 3) ",secondary," devBase print $(NF - 2) " " $(NF - 1) " " $NF "," $(NF - 6) "," $(NF - 5) "," $(NF - 3) ",secondary," $(NF - 7) "," devBase
} }
} }
' ) ' )
@ -2936,7 +2936,7 @@ get_partition_data()
devBase = gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 ) devBase = gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
used = sprintf( "%.2f", $4*1024/1000**3 ) used = sprintf( "%.2f", $4*1024/1000**3 )
percentUsed = sprintf( "%.0f", ( $4/$3 )*100 ) percentUsed = sprintf( "%.0f", ( $4/$3 )*100 )
print "swap-" swapCounter "," size "GB," used "GB," percentUsed "\%,main," devBase print "swap-" swapCounter "," size "GB," used "GB," percentUsed "\%,main," "swap," devBase
swapCounter = ++swapCounter swapCounter = ++swapCounter
}' ) ) }' ) )
IFS="$ORIGINAL_IFS" IFS="$ORIGINAL_IFS"
@ -2970,8 +2970,9 @@ get_partition_data_advanced()
IFS="," IFS=","
a_partition_working=( ${A_PARTITION_DATA[i]} ) a_partition_working=( ${A_PARTITION_DATA[i]} )
IFS="$ORIGINAL_IFS" IFS="$ORIGINAL_IFS"
# note: for swap this will already be set # note: for swap this will already be set
if [[ -z ${a_partition_working[5]} ]];then if [[ -z ${a_partition_working[6]} ]];then
mount_point=$( sed 's|/|\\/|g' <<< ${a_partition_working[0]} ) mount_point=$( sed 's|/|\\/|g' <<< ${a_partition_working[0]} )
#echo mount_point $mount_point #echo mount_point $mount_point
dev_partition_data=$( gawk ' dev_partition_data=$( gawk '
@ -3025,10 +3026,9 @@ get_partition_data_advanced()
print partition "," label "," uuid print partition "," label "," uuid
}' $FILE_MOUNTS ) }' $FILE_MOUNTS )
# echo dev_partition_data: $dev_partition_data
# assemble everything we could get for dev/h/dx, label, and uuid # assemble everything we could get for dev/h/dx, label, and uuid
IFS="," IFS=","
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_partition_data A_PARTITION_DATA[i]=${a_partition_working[0]}","${a_partition_working[1]}","${a_partition_working[2]}","${a_partition_working[3]}","${a_partition_working[4]}","${a_partition_working[5]}","$dev_partition_data
IFS="$ORIGINAL_IFS" IFS="$ORIGINAL_IFS"
fi fi
## now we're ready to proceed filling in the data ## now we're ready to proceed filling in the data
@ -3036,10 +3036,10 @@ get_partition_data_advanced()
a_partition_working=( ${A_PARTITION_DATA[i]} ) a_partition_working=( ${A_PARTITION_DATA[i]} )
IFS="$ORIGINAL_IFS" IFS="$ORIGINAL_IFS"
dev_item=${a_partition_working[5]} dev_item=${a_partition_working[6]}
dev_label=${a_partition_working[6]} dev_label=${a_partition_working[7]}
dev_uuid=${a_partition_working[7]} dev_uuid=${a_partition_working[8]}
# then if dev data/uuid is incomplete, try to get missing piece # then if dev data/uuid is incomplete, try to get missing piece
# it's more likely we'll get a uuid than a label. But this should get the # it's more likely we'll get a uuid than a label. But this should get the
# dev item set no matter what, so then we can get the rest of any missing data # dev item set no matter what, so then we can get the rest of any missing data
@ -3071,11 +3071,11 @@ get_partition_data_advanced()
/'$dev_item'/ { /'$dev_item'/ {
print $(NF - 2) print $(NF - 2)
}' ) }' )
fi fi
# assemble everything we could get for dev/h/dx, label, and uuid # assemble everything we could get for dev/h/dx, label, and uuid
IFS="," IFS=","
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 A_PARTITION_DATA[i]=${a_partition_working[0]}","${a_partition_working[1]}","${a_partition_working[2]}","${a_partition_working[3]}","${a_partition_working[4]}","${a_partition_working[5]}","$dev_item","$dev_label","$dev_uuid
IFS="$ORIGINAL_IFS" IFS="$ORIGINAL_IFS"
done done
log_function_data 'cat' "$FILE_MOUNTS" log_function_data 'cat' "$FILE_MOUNTS"
@ -4173,7 +4173,7 @@ print_partition_data()
local a_partition_working='' partition_used='' partition_data='' local a_partition_working='' partition_used='' partition_data=''
local counter=0 line_max=160 i=0 a_partition_data='' line_starter='' local counter=0 line_max=160 i=0 a_partition_data='' line_starter=''
local partitionIdClean='' part_dev='' full_dev='' part_label='' full_label='' local partitionIdClean='' part_dev='' full_dev='' part_label='' full_label=''
local part_uuid='' full_uuid='' dev_remote='' local part_uuid='' full_uuid='' dev_remote='' full_fs=''
# this handles the different, shorter, irc colors strings embedded in variable data # this handles the different, shorter, irc colors strings embedded in variable data
if [[ $B_RUNNING_IN_SHELL != 'true' ]];then if [[ $B_RUNNING_IN_SHELL != 'true' ]];then
@ -4197,21 +4197,28 @@ print_partition_data()
IFS="$ORIGINAL_IFS" IFS="$ORIGINAL_IFS"
full_label='' full_label=''
full_uuid='' full_uuid=''
if [[ $B_SHOW_PARTITIONS_FULL == 'true' ]] || [[ ${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 if [[ -n ${a_partition_working[2]} ]];then
partition_used=" ${C1}used:${C2} ${a_partition_working[2]} (${a_partition_working[3]})" partition_used=" ${C1}used:${C2} ${a_partition_working[2]} (${a_partition_working[3]})"
else else
partition_used='' # reset partition used to null partition_used='' # reset partition used to null
fi fi
if [[ -n ${a_partition_working[5]} ]];then
full_fs="${a_partition_working[5]}"
else
full_fs='N/A' # reset partition used to null
fi
full_fs=" ${C1}fs:${C2} $full_fs"
# don't show user names in output # don't show user names in output
if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]];then if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]];then
if [[ -n ${a_partition_working[5]} ]];then if [[ -n ${a_partition_working[6]} ]];then
if [[ -z $( grep -E '(^//|:/)' <<< ${a_partition_working[5]} ) ]];then if [[ -z $( grep -E '(^//|:/)' <<< ${a_partition_working[6]} ) ]];then
part_dev="/dev/${a_partition_working[5]}" part_dev="/dev/${a_partition_working[6]}"
dev_remote='dev' dev_remote='dev'
else else
part_dev="${a_partition_working[5]}" part_dev="${a_partition_working[6]}"
dev_remote='remote' dev_remote='remote'
fi fi
else else
@ -4220,16 +4227,16 @@ print_partition_data()
fi fi
full_dev=" ${C1}$dev_remote:${C2} $part_dev" full_dev=" ${C1}$dev_remote:${C2} $part_dev"
if [[ $B_SHOW_LABELS == 'true' && $dev_remote != 'remote' ]];then if [[ $B_SHOW_LABELS == 'true' && $dev_remote != 'remote' ]];then
if [[ -n ${a_partition_working[6]} ]];then if [[ -n ${a_partition_working[7]} ]];then
part_label="${a_partition_working[6]}" part_label="${a_partition_working[7]}"
else else
part_label='N/A' part_label='N/A'
fi fi
full_label=" ${C1}label:${C2} $part_label" full_label=" ${C1}label:${C2} $part_label"
fi fi
if [[ $B_SHOW_UUIDS == 'true' && $dev_remote != 'remote' ]];then if [[ $B_SHOW_UUIDS == 'true' && $dev_remote != 'remote' ]];then
if [[ -n ${a_partition_working[7]} ]];then if [[ -n ${a_partition_working[8]} ]];then
part_uuid="${a_partition_working[7]}" part_uuid="${a_partition_working[8]}"
else else
part_uuid='N/A' part_uuid='N/A'
fi fi
@ -4238,7 +4245,7 @@ print_partition_data()
fi fi
partitionIdClean=$( sed -r 's|/home/(.*)/(.*)|/home/##/\2|' <<< ${a_partition_working[0]} ) partitionIdClean=$( sed -r 's|/home/(.*)/(.*)|/home/##/\2|' <<< ${a_partition_working[0]} )
# because these lines can vary widely, using dynamic length handling here # because these lines can vary widely, using dynamic length handling here
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 " a_partition_data[$counter]="${a_partition_data[$counter]}${C1}ID:${C2}$partitionIdClean ${C1}size:${C2} ${a_partition_working[1]}$partition_used$full_dev$full_fs$full_label$full_uuid "
if [[ $( wc -c <<< ${a_partition_data[$counter]} ) -gt $line_max ]];then if [[ $( wc -c <<< ${a_partition_data[$counter]} ) -gt $line_max ]];then
((counter++)) ((counter++))