kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disk: Fix bash 3.2 incompatibility. Closes #1586

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

21
neofetch
View file

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