From 0f2d7a825a8515af39a0c6deea2fe720cf060e76 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Mon, 20 Nov 2023 00:31:09 +0100 Subject: [PATCH] DistroInventory Clean-up output --- functions.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/functions.sh b/functions.sh index ff4e9f0..c707d6b 100644 --- a/functions.sh +++ b/functions.sh @@ -213,11 +213,14 @@ UpgradeRelease () { ParseOSRelease() { if [ ! -z "$OSRELEASE" ]; then - DISTRO=$(printf "$OSRELEASE" | awk -F= '$1=="ID" { print $2 ;}') + DISTRO=$(printf "$OSRELEASE" | awk -F= '$1=="ID" { print $2 ;}' |tr -d '"') VERSION=$(printf "$OSRELEASE" | awk -F= '$1=="VERSION_ID" { print $2 ;}' |tr -d '"') - VERSIONNAME=$(printf "$OSRELEASE" | awk -F= '$1=="VERSION_CODENAME" { print $2 ;}') + VERSIONNAME=$(printf "$OSRELEASE" | awk -F= '$1=="VERSION_CODENAME" { print $2 ;}' |tr -d '"') + #PRETTYNAME=$(printf "$OSRELEASE" | awk -F= '$1=="PRETTY_NAME" { print $2 ;}' |tr -d '"' | cut -d "(" -f2 | cut -d ")" -f1) if [ ! -z "$VERSIONNAME" ]; then VERSION="$VERSION ($VERSIONNAME)" + #elif [ ! -z "$PRETTYNAME" ]; then + # VERSION="$VERSION ($PRETTYNAME)" fi else if [ -z ${DISTRO+x} ]; then local DISTRO=N/A;fi