starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-07-06 21:15:10 +02:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

fix command_version on Darwin/macOS 11

Browse Source 
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`.
This commit is contained in:
Joao Morais
2021-10-17 09:26:46 -03:00
committed by Lukas Schauer
parent 91cccc0c23
commit 6ee4ae508e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dehydrated
+2 -2
View File
@@ -1440,7 +1440,7 @@ command_version() {
revision="$(cd "${SCRIPTDIR}"; git rev-parse HEAD 2>/dev/null || echo "unknown")" revision="$(cd "${SCRIPTDIR}"; git rev-parse HEAD 2>/dev/null || echo "unknown")"
echo "GIT-Revision: ${revision}" echo "GIT-Revision: ${revision}"
echo "" echo ""
if [[ "${OSTYPE}" =~ "BSD" ]]; then if [[ "${OSTYPE}" =~ (BSD|Darwin) ]]; then
echo "OS: $(uname -sr)" echo "OS: $(uname -sr)"
elif [[ -e /etc/os-release ]]; then elif [[ -e /etc/os-release ]]; then
( . /etc/os-release && echo "OS: $PRETTY_NAME" ) ( . /etc/os-release && echo "OS: $PRETTY_NAME" )
@@ -1453,7 +1453,7 @@ command_version() {
[[ -n "${BASH_VERSION:-}" ]] && echo " bash: ${BASH_VERSION}" [[ -n "${BASH_VERSION:-}" ]] && echo " bash: ${BASH_VERSION}"
[[ -n "${ZSH_VERSION:-}" ]] && echo " zsh: ${ZSH_VERSION}" [[ -n "${ZSH_VERSION:-}" ]] && echo " zsh: ${ZSH_VERSION}"
echo " curl: ${CURL_VERSION}" echo " curl: ${CURL_VERSION}"
if [[ "${OSTYPE}" =~ "BSD" ]]; then if [[ "${OSTYPE}" =~ (BSD|Darwin) ]]; then
echo " awk, sed, mktemp, grep, diff: BSD base system versions" echo " awk, sed, mktemp, grep, diff: BSD base system versions"
else else
echo " awk: $(awk -W version 2>&1 | head -n1)" echo " awk: $(awk -W version 2>&1 | head -n1)"