Disk: Don't declare variables if we're only using them once

This commit is contained in:
Dylan Araps 2016-12-17 10:22:11 +11:00
parent 952834f8be
commit 7b99e15e1f
1 changed files with 6 additions and 9 deletions

View File

@ -1543,19 +1543,16 @@ get_disk() {
# Get the info for /
disks=($(df -P -h /)) || { err "Disk: 'df' exited with error code 1"; return; }
disk_used="${disks[9]/i}"
disk_total="${disks[8]/i}"
disk_total_per="(${disks[11]})"
# Put it all together
disk="${disk_used} / ${disk_total} ${disk_total_per}"
disk_perc="${disks[11]/'%'}"
disk="${disks[9]/i} / ${disks[8]/i} (${disk_perc}%)"
# Bar
case "$disk_display" in
"bar") disk="$(bar "${disk_total_per/'%'}" "100")" ;;
"infobar") disk+=" $(bar "${disk_total_per/'%'}" "100")" ;;
"barinfo") disk="$(bar "${disk_total_per/'%'}" "100") $disk" ;;
"perc") disk="$disk_total_per $(bar "$disk_total_per" "100")" ;;
"bar") disk="$(bar "$disk_perc" "100")" ;;
"infobar") disk+=" $(bar "$disk_perc" "100")" ;;
"barinfo") disk="$(bar "$disk_perc" "100") $disk" ;;
"perc") disk="${disk_perc}% $(bar "$disk_perc" "100")" ;;
esac
}