disk: Fix paths with spaces in names. Closes #1445

This commit is contained in:
Dylan Araps 2020-05-22 10:27:36 +03:00
parent 6a5dfb874e
commit c160c07399
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 7 additions and 7 deletions

View File

@ -3493,7 +3493,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[4]/\%} disk_perc=${disk_info[-2]/\%}
case $disk_percent in case $disk_percent in
off) disk_perc= off) disk_perc=
@ -3501,29 +3501,29 @@ get_disk() {
case $df_version in case $df_version in
*befhikm*) *befhikm*)
disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G" disk="$((disk_info[-4]/1024/1024))G / $((disk_info[-5]/1024/1024))G"
disk+="${disk_perc:+ ($disk_perc%)}" disk+="${disk_perc:+ ($disk_perc%)}"
;; ;;
*) *)
disk="${disk_info[2]/i} / ${disk_info[1]/i}${disk_perc:+ ($disk_perc%)}" disk="${disk_info[-4]/i} / ${disk_info[-5]/i}${disk_perc:+ ($disk_perc%)}"
;; ;;
esac esac
case $disk_subtitle in case $disk_subtitle in
name) name)
disk_sub=${disk_info[0]} disk_sub=${disk_info[@]::${#disk_info[@]}-5}
;; ;;
dir) dir)
disk_sub=${disk_info[5]/*\/} disk_sub=${disk_info[-1]/*\/}
disk_sub=${disk_sub:-${disk_info[5]}} disk_sub=${disk_sub:-${disk_info[-1]}}
;; ;;
none) ;; none) ;;
*) *)
disk_sub=${disk_info[5]} disk_sub=${disk_info[-1]}
;; ;;
esac esac