disk: Fix bash 3.2 incompatibility. Closes #1586

This commit is contained in:
Dylan Araps 2020-11-17 18:43:32 +02:00
parent cb6f10d8f4
commit 2b39f58f74
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 13 additions and 8 deletions

View File

@ -3586,7 +3586,7 @@ get_disk() {
for disk in "${disks[@]}"; do for disk in "${disks[@]}"; do
# Create a second array and make each element split at whitespace this time. # Create a second array and make each element split at whitespace this time.
IFS=" " read -ra disk_info <<< "$disk" IFS=" " read -ra disk_info <<< "$disk"
disk_perc=${disk_info[-2]/\%} disk_perc=${disk_info[${#disk_info[@]} - 2]/\%}
case $disk_percent in case $disk_percent in
off) disk_perc= off) disk_perc=
@ -3594,29 +3594,34 @@ get_disk() {
case $df_version in case $df_version in
*befhikm*) *befhikm*)
disk="$((disk_info[-4]/1024/1024))G / $((disk_info[-5]/1024/1024))G" disk=$((disk_info[${#disk_info[@]} - 4] / 1024 / 1024))G
disk+="${disk_perc:+ ($disk_perc%)}" disk+=" / "
disk+=$((disk_info[${#disk_info[@]} - 5] / 1024/ 1024))G
disk+=${disk_perc:+ ($disk_perc%)}
;; ;;
*) *)
disk="${disk_info[-4]/i} / ${disk_info[-5]/i}${disk_perc:+ ($disk_perc%)}" disk=${disk_info[${#disk_info[@]} - 4]/i}
disk+=" / "
disk+=${disk_info[${#disk_info[@]} - 5]/i}
disk+=${disk_perc:+ ($disk_perc%)}
;; ;;
esac esac
case $disk_subtitle in case $disk_subtitle in
name) name)
disk_sub=${disk_info[*]::${#disk_info[@]}-5} disk_sub=${disk_info[*]::${#disk_info[@]} - 5}
;; ;;
dir) dir)
disk_sub=${disk_info[-1]/*\/} disk_sub=${disk_info[${#disk_info[@]} - 1]/*\/}
disk_sub=${disk_sub:-${disk_info[-1]}} disk_sub=${disk_sub:-${disk_info[${#disk_info[@]} - 1]}}
;; ;;
none) ;; none) ;;
*) *)
disk_sub=${disk_info[-1]} disk_sub=${disk_info[${#disk_info[@]} - 1]}
;; ;;
esac esac