From 175d90aad76e2f4eebceb716b40390d0e6dd5062 Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 17 Oct 2025 13:04:03 +0200 Subject: [PATCH] fix: Move order in entry file (#1078) --- src/entry.sh | 2 +- src/memory.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/entry.sh b/src/entry.sh index 3512b91..2154ce5 100755 --- a/src/entry.sh +++ b/src/entry.sh @@ -18,8 +18,8 @@ cd /run . proc.sh # Initialize processor . serial.sh # Initialize serialport . power.sh # Configure shutdown -. config.sh # Configure arguments . memory.sh # Check available memory +. config.sh # Configure arguments . finish.sh # Finish initialization trap - ERR diff --git a/src/memory.sh b/src/memory.sh index 76c17e5..246405d 100644 --- a/src/memory.sh +++ b/src/memory.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}') - + if [[ "$RAM_CHECK" != [Nn]* && "${RAM_SIZE,,}" != "max" && "${RAM_SIZE,,}" != "half" ]]; then AVAIL_MEM=$(formatBytes "$RAM_AVAIL") @@ -59,15 +59,15 @@ if [[ "${RAM_SIZE,,}" == "max" ]]; then RAM_WANTED=$(( RAM_WANTED / 1073741825 )) if (( "$RAM_WANTED" < 1 )); then - + RAM_WANTED=$(( RAM_AVAIL - RAM_SPARE )) RAM_WANTED=$(( RAM_WANTED / 1048577 )) - + if (( "$RAM_WANTED" < 1 )); then RAM_WANTED=$(( RAM_AVAIL )) RAM_WANTED=$(( RAM_WANTED / 1048577 )) - + fi RAM_SIZE="${RAM_WANTED}M" @@ -80,7 +80,7 @@ if [[ "${RAM_SIZE,,}" == "max" ]]; then else RAM_SIZE="${RAM_WANTED}G" fi - + fi return 0