From 5f8cfa50ba93f7ffeb3fca4bcc6fd01c3dfb925c Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 18 Sep 2020 00:15:04 +0200 Subject: [PATCH] fix OS name detection before applying heuristics, use PRETTY_NAME from os-release(3), which reliably exists on all common linux distributions. keep the /etc/issue parsing as fallback. --- dehydrated | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dehydrated b/dehydrated index dbbebbb..dad9f9f 100755 --- a/dehydrated +++ b/dehydrated @@ -1369,6 +1369,10 @@ command_version() { echo "" if [[ "${OSTYPE}" =~ "BSD" ]]; then echo "OS: $(uname -sr)" + elif [[ -e /etc/os-release ]]; then + ( . /etc/os-release && echo "OS: $PRETTY_NAME" ) + elif [[ -e /usr/lib/os-release ]]; then + ( . /usr/lib/os-release && echo "OS: $PRETTY_NAME" ) else echo "OS: $(cat /etc/issue | grep -v ^$ | head -n1 | _sed 's/\\(r|n|l) .*//g')" fi -- 2.47.3