From 0951fbca454dd078eeaa7be38df06d540c7fb70f Mon Sep 17 00:00:00 2001 From: Abhishek Keshri Date: Wed, 27 Mar 2024 09:27:18 +0530 Subject: [PATCH] feat: add padding --- scripts/cpu.sh | 2 +- scripts/ram.sh | 15 +++++++-------- scripts/utils.sh | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/scripts/cpu.sh b/scripts/cpu.sh index 72332e2..4887aae 100755 --- a/scripts/cpu.sh +++ b/scripts/cpu.sh @@ -17,7 +17,7 @@ get_percent() { cpucores=$(sysctl -n hw.logicalcpu) cpuusage=$((cpuvalue / cpucores)) percent="$cpuusage%" - normalize_padding $percent + normalize_padding "$percent" ;; CYGWIN* | MINGW32* | MSYS* | MINGW*) ;; # TODO - windows compatibility diff --git a/scripts/ram.sh b/scripts/ram.sh index 3505645..e6054f2 100755 --- a/scripts/ram.sh +++ b/scripts/ram.sh @@ -10,15 +10,14 @@ get_percent() { Linux) total_mem=$(free -g | awk '/^Mem/ {print $2}') used_mem=$(free -g | awk '/^Mem/ {print $3}') - memory_percent=$(awk "BEGIN {printf \"%.2f\", ($used_mem / $total_mem * 100)}") - echo "$memory_percent%" + memory_percent=$(((used_mem * 100) / total_mem)) + normalize_padding "$memory_percent%" ;; Darwin) - used_mem=$(vm_stat | grep ' active\|wired ' | sed 's/[^0-9]//g' | paste -sd ' ' - | \ - awk -v pagesize="$(pagesize)" '{printf "%d\n", ($1+$2) * pagesize / 1048576}') + used_mem=$(vm_stat | grep ' active\|wired ' | sed 's/[^0-9]//g' | paste -sd ' ' - | awk -v pagesize=$(pagesize) '{printf "%d\n", ($1+$2) * pagesize / 1048576}') total_mem=$(system_profiler SPHardwareDataType | grep "Memory:" | awk '{print $2}') - memory_percent=$(awk "BEGIN {printf \"%.2f\", ($used_mem / $total_mem / 10)}") - echo "$memory_percent%" + memory_percent=$(((used_mem) / total_mem / 10)) + normalize_padding "$memory_percent%" ;; FreeBSD) hw_pagesize="$(sysctl -n hw.pagesize)" @@ -29,8 +28,8 @@ get_percent() { free_mem=$(((mem_inactive + mem_unused + mem_cache) / 1024 / 1024)) total_mem=$(($(sysctl -n hw.physmem) / 1024 / 1024)) used_mem=$((total_mem - free_mem)) - memory_percent=$(awk "BEGIN {printf \"%.2f\", ($used_mem / $total_mem * 100)}") - echo "$memory_percent%" + memory_percent=$(((used_mem * 100) / total_mem)) + normalize_padding "$memory_percent%" ;; CYGWIN* | MINGW32* | MSYS* | MINGW*) ;; # TODO - windows compatibility esac diff --git a/scripts/utils.sh b/scripts/utils.sh index 29efcc0..ac93192 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -12,8 +12,8 @@ get_tmux_option() { } normalize_padding() { - max_len=${2:-5} percent_len=${#1} + max_len=${2:-5} let diff_len=$max_len-$percent_len # if the diff_len is even, left will have 1 more space than right let left_spaces=($diff_len + 1)/2