diff --git a/inxi b/inxi index 5d4377c..ff88d91 100755 --- a/inxi +++ b/inxi @@ -1,8 +1,8 @@ #!/usr/bin/env bash ######################################################################## #### Script Name: inxi -#### Version: 2.1.18 -#### Date: 2014-04-04 +#### Version: 2.1.19 +#### Date: 2014-04-06 #### Patch Number: 00 ######################################################################## #### SPECIAL THANKS @@ -10764,7 +10764,7 @@ print_partition_data() { eval $LOGFS local a_partition_working='' partition_used='' partition_data='' - local counter=0 i=0 a_partition_data='' line_starter='' line_max=$(( $COLS_INNER - 25 )) + local counter=0 i=0 part_id=0 a_partition_data='' line_starter='' local partitionIdClean='' part_dev='' full_dev='' part_label='' full_label='' local part_uuid='' full_uuid='' dev_remote='' full_fs='' local b_non_dev='false' holder='' @@ -10833,7 +10833,7 @@ print_partition_data() else partitionIdClean=${a_partition_working[0]} fi - id_size_fs="${C1}ID-$((counter+1))$SEP3${C2} $partitionIdClean ${C1}size$SEP3${C2} ${a_partition_working[1]} $partition_used$full_fs$full_dev" + id_size_fs="${C1}ID-$((part_id+1))$SEP3${C2} $partitionIdClean ${C1}size$SEP3${C2} ${a_partition_working[1]} $partition_used$full_fs$full_dev" label_uuid="$full_label$full_uuid" # label/uuid always print one per line, so only wrap if it's very long if [[ $B_SHOW_UUIDS == 'true' || $B_SHOW_LABELS == 'true' ]] && \ @@ -10851,10 +10851,7 @@ print_partition_data() fi fi ((counter++)) -# # because these lines can vary widely, using dynamic length handling here -# if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]] || [[ $( calculate_line_length "${a_partition_data[$counter]}" ) -gt $line_max ]];then -# ((counter++)) -# fi + ((part_id++)) fi done # print out all lines, line starter on first line diff --git a/inxi.changelog b/inxi.changelog index b76462e..24dbd99 100755 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,16 @@ +===================================================================================== +Version: 2.1.19 +Patch Version: 00 +Script Date: 2014-04-06 +----------------------------------- +Changes: +----------------------------------- +New version, tarball, correction of loop counts for -p/-P ID-, this requires +a third counter to get all the stuff right. Sorry about the extra release, that's life. + +----------------------------------- +-- Harald Hope - Sun, 06 Apr 2014 14:33:46 -0700 + ===================================================================================== Version: 2.1.18 Patch Version: 00