From 6ee4ae508e259260e00d0ddbe10a982d43de89a5 Mon Sep 17 00:00:00 2001 From: Joao Morais Date: Sun, 17 Oct 2021 09:26:46 -0300 Subject: [PATCH] fix command_version on Darwin/macOS 11 Current output of `uname` on Darwin/macOS 11 is only `Darwin`, which breaks the premisse used in `command_version()`. This update adds `Darwin` alongside `BSD`. --- dehydrated | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dehydrated b/dehydrated index d61807e..9c1de44 100755 --- a/dehydrated +++ b/dehydrated @@ -1440,7 +1440,7 @@ command_version() { revision="$(cd "${SCRIPTDIR}"; git rev-parse HEAD 2>/dev/null || echo "unknown")" echo "GIT-Revision: ${revision}" echo "" - if [[ "${OSTYPE}" =~ "BSD" ]]; then + if [[ "${OSTYPE}" =~ (BSD|Darwin) ]]; then echo "OS: $(uname -sr)" elif [[ -e /etc/os-release ]]; then ( . /etc/os-release && echo "OS: $PRETTY_NAME" ) @@ -1453,7 +1453,7 @@ command_version() { [[ -n "${BASH_VERSION:-}" ]] && echo " bash: ${BASH_VERSION}" [[ -n "${ZSH_VERSION:-}" ]] && echo " zsh: ${ZSH_VERSION}" echo " curl: ${CURL_VERSION}" - if [[ "${OSTYPE}" =~ "BSD" ]]; then + if [[ "${OSTYPE}" =~ (BSD|Darwin) ]]; then echo " awk, sed, mktemp, grep, diff: BSD base system versions" else echo " awk: $(awk -W version 2>&1 | head -n1)" -- 2.47.3