From 463674c3820f50f17512dc96f2ed48f7c0c2fc5d Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 11 Dec 2024 20:51:25 +0000
Subject: [PATCH] ui updates
---
lgsm/modules/command_dev_detect_glibc.sh | 10 +++++-----
lgsm/modules/command_dev_detect_ldd.sh | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lgsm/modules/command_dev_detect_glibc.sh b/lgsm/modules/command_dev_detect_glibc.sh
index a3819bf15..4eb88db37 100644
--- a/lgsm/modules/command_dev_detect_glibc.sh
+++ b/lgsm/modules/command_dev_detect_glibc.sh
@@ -56,18 +56,18 @@ for glibc_check_var in "${glibc_check_dir_array[@]}"; do
done
echo -e ""
echo -e ""
- echo -e "${glibc_check_name} glibc Requirements"
+ fn_print_nl "${bold}${lightyellow}${glibc_check_name} glibc Requirements"
fn_messages_separator
if [ -f "${tmpdir}/detect_glibc_files_${glibc_check_var}.tmp" ]; then
echo -e "Required glibc"
- cat "${tmpdir}/detect_glibc_${glibc_check_var}.tmp" | sort | uniq | sort -r --version-sort | head -1 | tee -a "${tmpdir}/detect_glibc_highest.tmp"
+ cat "${tmpdir}/detect_glibc_${glibc_check_var}.tmp" | sort | uniq | sort -r --version-sort | head -1 | sed 's/)$//' | tee -a "${tmpdir}/detect_glibc_highest.tmp"
echo -e ""
echo -e "Files requiring GLIBC"
echo -e "Highest verion required: filename"
cat "${tmpdir}/detect_glibc_files_${glibc_check_var}.tmp"
echo -e ""
echo -e "All required GLIBC versions"
- cat "${tmpdir}/detect_glibc_${glibc_check_var}.tmp" | sort | uniq | sort -r --version-sort
+ cat "${tmpdir}/detect_glibc_${glibc_check_var}.tmp" | sort | uniq | sort -r --version-sort | sed 's/)$//'
rm -f "${tmpdir:?}/detect_glibc_${glibc_check_var}.tmp"
rm -f "${tmpdir:?}/detect_glibc_files_${glibc_check_var}.tmp"
else
@@ -78,10 +78,10 @@ for glibc_check_var in "${glibc_check_dir_array[@]}"; do
fi
done
echo -e ""
-echo -e "Final glibc Requirement"
+fn_print_nl "${bold}${lightyellow}Final glibc Requirement"
fn_messages_separator
if [ -f "${tmpdir}/detect_glibc_highest.tmp" ]; then
- cat "${tmpdir}/detect_glibc_highest.tmp" | sort | uniq | sort -r --version-sort | head -1
+ cat "${tmpdir}/detect_glibc_highest.tmp" | sort | uniq | sort -r --version-sort | head -1 | sed 's/)$//'
rm -f "${tmpdir:?}/detect_glibc_highest.tmp"
else
fn_print_information_nl "glibc is not required"
diff --git a/lgsm/modules/command_dev_detect_ldd.sh b/lgsm/modules/command_dev_detect_ldd.sh
index 9c8473036..62db24da0 100644
--- a/lgsm/modules/command_dev_detect_ldd.sh
+++ b/lgsm/modules/command_dev_detect_ldd.sh
@@ -44,12 +44,12 @@ find "${serverfiles}" -type f -print0 \
done
echo -e ""
echo -e ""
-echo -e "All"
+fn_print_nl "${bold}${lightyellow}All${default}"
fn_messages_separator
cat "${tmpdir}/detect_ldd.tmp"
echo -e ""
-echo -e "Not Found"
+fn_print_nl "${bold}${lightyellow}Not Found${default}"
fn_messages_separator
cat "${tmpdir}/detect_ldd_not_found.tmp"