Make minor fixes to output_env.sh after review
A number of clean-up improvements following review.
* removal of redundant `` quotes
* removal of non-portable echo "\n", in favour of additional echo commands
* change to use of uname to detemine if the platform is Linux or not
* revised formatting of output
* change to dpkg-query from dpkg to find installed libasan variants
Co-Authored-By: Gilles Peskine <gilles.peskine@arm.com>
Signed-off-by: Simon Butcher <simon.butcher@arm.com>
diff --git a/scripts/output_env.sh b/scripts/output_env.sh
index 62c5634..22bef92 100755
--- a/scripts/output_env.sh
+++ b/scripts/output_env.sh
@@ -26,11 +26,11 @@
VARIANT=$1
shift
- if [ ! -z $VARIANT ]; then
+ if [ -n "$VARIANT" ]; then
VARIANT=" ($VARIANT)"
fi
- if ! `type "$BIN" > /dev/null 2>&1`; then
+ if ! type "$BIN" > /dev/null 2>&1; then
echo " * ${BIN##*/}$VARIANT: Not found."
return 0
fi
@@ -48,8 +48,10 @@
echo " * ${BIN##*/}$VARIANT: ${BIN} : ${VERSION_STR} "
}
-echo "Platform:\n"
-if `type "lsb_release" > /dev/null 2>&1`; then
+echo "** Platform:"
+echo
+
+if [ `uname -s` = "Linux" ]; then
echo "Linux variant"
lsb_release -d -c
else
@@ -59,8 +61,10 @@
echo
print_version "uname" "-a" ""
-echo "\n"
-echo "Tool Versions:\n"
+echo
+echo
+echo "** Tool Versions:"
+echo
if [ "${RUN_ARMCC:-1}" -ne 0 ]; then
: "${ARMC5_CC:=armcc}"
@@ -131,14 +135,14 @@
echo
echo " * Installed asan versions:"
-if `hash dpkg > /dev/null 2>&1` && `dpkg --get-selections|grep libasan > /dev/null` ; then
- dpkg -s libasan5 2> /dev/null | grep -i version
- dpkg -s libasan4 2> /dev/null | grep -i version
- dpkg -s libasan3 2> /dev/null | grep -i version
- dpkg -s libasan2 2> /dev/null | grep -i version
- dpkg -s libasan1 2> /dev/null | grep -i version
- dpkg -s libasan0 2> /dev/null | grep -i version
+if type dpkg-query >/dev/null 2>/dev/null; then
+ if ! dpkg-query -f '${Status} ${Package}: ${Version}\n' -W 'libasan*' |
+ awk '$3 == "installed" && $4 !~ /-/ {print $4, $5}' |
+ grep .
+ then
+ echo " No asan versions installed."
+ fi
else
- echo " Either dpkg not present or no asan versions installed."
+ echo " Unable to determine the asan version without dpkg."
fi
echo