From ddeac2d856132139eb27abe93973276c66d32404 Mon Sep 17 00:00:00 2001 From: Bourne-ID Date: Mon, 15 Oct 2018 20:38:02 +0100 Subject: [PATCH 1/5] Fix blank space to tab --- lgsm/functions/check_deps.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index f95d7a457..7b1e262b3 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -141,12 +141,12 @@ fn_deps_detector(){ deptocheck="${javaversion}" unset javacheck elif [ "${deptocheck}" == "jq" ]&&[ "${distroversion}" == "6" ]; then - jqstatus=1 - elif [ "${deptocheck}" == "jq" ]&&[ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "18.04" ]&& ! grep -qE "^deb .*universe" /etc/apt/sources.list; then - depstatus=1 - jquniversemissing=1 - #1985 ubuntu 18.04.1 bug does not set sources.list correctly which means universe is not active by default - #check if the universe exists and active + jqstatus=1 + elif [ "${deptocheck}" == "jq" ]&&[ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "18.04" ]&& ! grep -qE "^deb .*universe" /etc/apt/sources.list; then + depstatus=1 + jquniversemissing=1 + #1985 ubuntu 18.04.1 bug does not set sources.list correctly which means universe is not active by default + #check if the universe exists and active elif [ "${deptocheck}" == "mono-complete" ]; then if [ "$(command -v mono 2>/dev/null)" ]&&[ "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then # Mono >= 5.0.0 already installed From 6908d6fe5d08e032d86e8ee3dc3a2a3167c8b0dc Mon Sep 17 00:00:00 2001 From: Bourne-ID Date: Mon, 15 Oct 2018 20:39:42 +0100 Subject: [PATCH 2/5] comment updates --- lgsm/functions/check_deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 7b1e262b3..948e7435c 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -143,10 +143,10 @@ fn_deps_detector(){ elif [ "${deptocheck}" == "jq" ]&&[ "${distroversion}" == "6" ]; then jqstatus=1 elif [ "${deptocheck}" == "jq" ]&&[ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "18.04" ]&& ! grep -qE "^deb .*universe" /etc/apt/sources.list; then + #1985 ubuntu 18.04.1 bug does not set sources.list correctly which means universe is not active by default + #If the universe repo does not exist, mark as dependency missing and universe missing depstatus=1 jquniversemissing=1 - #1985 ubuntu 18.04.1 bug does not set sources.list correctly which means universe is not active by default - #check if the universe exists and active elif [ "${deptocheck}" == "mono-complete" ]; then if [ "$(command -v mono 2>/dev/null)" ]&&[ "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then # Mono >= 5.0.0 already installed From bd50f74b37e37a4a071db1c5a5593023d6cae573 Mon Sep 17 00:00:00 2001 From: BourneID Date: Thu, 25 Oct 2018 23:36:16 +0100 Subject: [PATCH 3/5] Add check for MemAvailable and calculations if it does not exist. --- lgsm/functions/info_distro.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 71e3aa33c..ac56fa233 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -91,6 +91,28 @@ load=$(uptime|awk -F 'load average: ' '{ print $2 }') ## Memory information +# Issue #2005 - Kernel 3.14+ contains MemAvailable which should be used. All others will be calculated + +# define the following as integers due to AWK string issues +declare -i physmemtotalkb +declare -i physmemfreekb +declare -i physmembufferskb +declare -i physmemcachedkb +declare -i physmemactualfreekb + +# get the raw KB values of these fields +physmemtotalkb=$(grep MemTotal /proc/meminfo | awk '{print $2}') +physmemfreekb=$(grep ^MemFree /proc/meminfo | awk '{print $2}') +physmembufferskb=$(grep ^Buffers /proc/meminfo | awk '{print $2}') +physmemcachedkb=$(grep ^Cached /proc/meminfo | awk '{print $2}') + +# check if MemAvailable Exists +if grep -q ^MemAvailable /proc/meminfo; then +physmemactualfreekb=$(grep ^MemAvailable /proc/meminfo | awk '{print $2}') +else +physmemactualfreekb=${physmemfreekb}+${physmembufferskb}+${physmemcachedkb} +fi + # Available RAM and swap. physmemtotalmb=$(($(grep MemTotal /proc/meminfo | awk '{print $2}')/1024)) physmemtotal=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^MemTotal /proc/meminfo | awk '{print $2}')K") From bb15be9e80b5b22c093f4451c7aa037927336b50 Mon Sep 17 00:00:00 2001 From: BourneID Date: Fri, 26 Oct 2018 09:04:23 +0100 Subject: [PATCH 4/5] Fix for #2005 to look for MemAvailable, use if exists otherwise calculate it --- lgsm/functions/info_distro.sh | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index ac56fa233..c7adf2a9e 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -93,38 +93,27 @@ load=$(uptime|awk -F 'load average: ' '{ print $2 }') # Issue #2005 - Kernel 3.14+ contains MemAvailable which should be used. All others will be calculated -# define the following as integers due to AWK string issues -declare -i physmemtotalkb -declare -i physmemfreekb -declare -i physmembufferskb -declare -i physmemcachedkb -declare -i physmemactualfreekb - # get the raw KB values of these fields physmemtotalkb=$(grep MemTotal /proc/meminfo | awk '{print $2}') physmemfreekb=$(grep ^MemFree /proc/meminfo | awk '{print $2}') physmembufferskb=$(grep ^Buffers /proc/meminfo | awk '{print $2}') physmemcachedkb=$(grep ^Cached /proc/meminfo | awk '{print $2}') +physmemreclaimablekb=$(grep ^SReclaimable /proc/meminfo | awk '{print $2}') # check if MemAvailable Exists if grep -q ^MemAvailable /proc/meminfo; then -physmemactualfreekb=$(grep ^MemAvailable /proc/meminfo | awk '{print $2}') + physmemactualfreekb=$(grep ^MemAvailable /proc/meminfo | awk '{print $2}') else -physmemactualfreekb=${physmemfreekb}+${physmembufferskb}+${physmemcachedkb} + physmemactualfreekb=$((${physmemfreekb}+${physmembufferskb}+${physmemcachedkb})) fi # Available RAM and swap. -physmemtotalmb=$(($(grep MemTotal /proc/meminfo | awk '{print $2}')/1024)) -physmemtotal=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^MemTotal /proc/meminfo | awk '{print $2}')K") -physmemfree=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')K") -physmemused=$(numfmt --to=iec --from=iec --suffix=B "$(($(grep "^MemTotal\:" /proc/meminfo | awk '{print $2}')-$(grep "^MemFree\:" /proc/meminfo | awk '{print $2}')-$(grep "^Buffers\:" /proc/meminfo | awk '{print $2}')-$(grep "^Cached\:" /proc/meminfo | awk '{print $2}')-$(grep "^SReclaimable\:" /proc/meminfo | awk '{print $2}')))K") -{ # try - physmemavailable=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')K") - physmemcached=$(numfmt --to=iec --from=iec --suffix=B "$(($(grep ^Cached /proc/meminfo | awk '{print $2}')+$(grep "^SReclaimable\:" /proc/meminfo | awk '{print $2}')))K") -} 2>/dev/null || { # fail silently, catch - physmemavailable="n/a" - physmemcached="n/a" -} +physmemtotalmb=$((${physmemtotalkb}/1024)) +physmemtotal=$(numfmt --to=iec --from=iec --suffix=B "${physmemtotalkb}K") +physmemfree=$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K") +physmemused=$(numfmt --to=iec --from=iec --suffix=B "$((${physmemtotalkb}-${physmemfreekb}-${physmembufferskb}-${physmemcachedkb}-${physmemreclaimablekb}))K") +physmemavailable=$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K") +physmemcached=$(numfmt --to=iec --from=iec --suffix=B "$((${physmemcachedkb}+${physmemreclaimablekb}))K") swaptotal=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapTotal /proc/meminfo | awk '{print $2}')K") swapfree=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapFree /proc/meminfo | awk '{print $2}')K") From ea5ad0ad9a0b15be76125d2fbb2b8ddf0fc1dcc2 Mon Sep 17 00:00:00 2001 From: BourneID Date: Fri, 26 Oct 2018 21:12:50 +0100 Subject: [PATCH 5/5] Spaces to Tabs and re-add universe code --- lgsm/functions/check_deps.sh | 60 ++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 948e7435c..62a957888 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -96,36 +96,36 @@ fn_install_mono_repo(){ } fn_install_universe_repo(){ - # Defensive coding - As this is an ubuntu only issue then check to make sure this fix is needed, and we are using ubuntu - if [ "${jquniversemissing}" != "0" ]&&[ "${distroid}" == "ubuntu" ]; then - fn_print_warning_nl "Ubuntu 18.04.1 contains a bug which means the sources.list file does not populate with the Ubuntu universe repository." - fn_print_information_nl "Attempting to add Universe Repo" - sleep 0.5 - sudo -v > /dev/null 2>&1 - if [ $? -eq 0 ]; then - echo -en ".\r" - sleep 1 - echo -en "..\r" - sleep 1 - echo -en "...\r" - sleep 1 - echo -en " \r" - cmd="sudo apt-add-repository universe" - eval ${cmd} - if [ $? -eq 0 ]; then - fn_print_complete_nl "Installing universe repository completed." - fn_script_log_pass "Installing universe repository completed." - else - fn_print_failure_nl "Unable to install universe repository." - fn_script_log_fatal "Unable to install universe repository." - fi - else - fn_print_warning_nl "$(whoami) does not have sudo access. Manually add Universe repository." - fn_script_log_warn "$(whoami) does not have sudo access. Manually add Universe repository." - echo " Please run the following command as a user with sudo access, and re-run the installation" - echo " sudo apt-add-repository universe" - fi - fi + # Defensive coding - As this is an ubuntu only issue then check to make sure this fix is needed, and we are using ubuntu + if [ "${jquniversemissing}" != "0" ]&&[ "${distroid}" == "ubuntu" ]; then + fn_print_warning_nl "Ubuntu 18.04.1 contains a bug which means the sources.list file does not populate with the Ubuntu universe repository." + fn_print_information_nl "Attempting to add Universe Repo" + sleep 0.5 + sudo -v > /dev/null 2>&1 + if [ $? -eq 0 ]; then + echo -en ".\r" + sleep 1 + echo -en "..\r" + sleep 1 + echo -en "...\r" + sleep 1 + echo -en " \r" + cmd="sudo apt-add-repository universe" + eval ${cmd} + if [ $? -eq 0 ]; then + fn_print_complete_nl "Installing universe repository completed." + fn_script_log_pass "Installing universe repository completed." + else + fn_print_failure_nl "Unable to install universe repository." + fn_script_log_fatal "Unable to install universe repository." + fi + else + fn_print_warning_nl "$(whoami) does not have sudo access. Manually add Universe repository." + fn_script_log_warn "$(whoami) does not have sudo access. Manually add Universe repository." + echo " Please run the following command as a user with sudo access, and re-run the installation" + echo " sudo apt-add-repository universe" + fi + fi } fn_deps_detector(){