From c0f118250e783d1fbcdef93cc2cc8277b1e69153 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 20 Jun 2017 15:01:40 +0100 Subject: [PATCH] Switch to MB so that RAM requirements can be more granular --- src/freedombone-app-etherpad | 2 +- src/freedombone-app-matrix | 2 +- src/freedombone-utils-setup | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/freedombone-app-etherpad b/src/freedombone-app-etherpad index 8ba4ccd8..b53db778 100755 --- a/src/freedombone-app-etherpad +++ b/src/freedombone-app-etherpad @@ -452,7 +452,7 @@ function install_etherpad { exit 7359 fi - check_ram_availability 2 + check_ram_availability 2000 if [ -f $IMAGE_PASSWORD_FILE ]; then ETHERPAD_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)" diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix index 52fe6da7..3398cc58 100755 --- a/src/freedombone-app-matrix +++ b/src/freedombone-app-matrix @@ -626,7 +626,7 @@ function install_home_server { } function install_matrix { - check_ram_availability 2 + check_ram_availability 1500 if [ ! -d $INSTALL_DIR ]; then mkdir -p $INSTALL_DIR diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup index d98c94c1..f9a04c1a 100755 --- a/src/freedombone-utils-setup +++ b/src/freedombone-utils-setup @@ -1029,12 +1029,12 @@ function combine_all_scripts { } function check_ram_availability { - minimum_ram_gb="$1" - minimum_ram_bytes=$((minimum_ram_gb * 1024 * 1024)) + minimum_ram_MB="$1" + minimum_ram_bytes=$((minimum_ram_gb * 1024)) ram_available=$(grep MemTotal /proc/meminfo | awk '{print $2}') if [ $ram_available -lt $minimum_ram_bytes ]; then - echo $"Need at least ${minimum_ram_gb}GB RAM to install this app" + echo $"Need at least ${minimum_ram_gb}MB RAM to install this app" exit 783524 fi }