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

BSD bugfixes for version command (closes #619)

Browse Source
This commit is contained in:
Lukas Schauer
2019-03-03 21:51:01 +01:00
parent 133e31de0b
commit ea93170959
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dehydrated
View File

@@ -978,7 +978,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}" = "FreeBSD" ]]; then if [[ "${OSTYPE}" =~ "BSD" ]]; then
echo "OS: $(uname -sr)" echo "OS: $(uname -sr)"
else else
echo "OS: $(cat /etc/issue | grep -v ^$ | head -n1 | _sed 's/\\(r|n|l) .*//g')" echo "OS: $(cat /etc/issue | grep -v ^$ | head -n1 | _sed 's/\\(r|n|l) .*//g')"
@@ -987,15 +987,15 @@ 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 2>&1 | head -n1 | cut -d" " -f1-2)" echo " curl: $(curl --version 2>&1 | head -n1 | cut -d" " -f1-2)"
if [[ "${OSTYPE}" = "FreeBSD" ]]; then if [[ "${OSTYPE}" =~ "BSD" ]]; then
echo " awk, sed, mktemp: FreeBSD 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)"
echo " sed: $(sed --version 2>&1 | head -n1)" echo " sed: $(sed --version 2>&1 | head -n1)"
echo " mktemp: $(mktemp --version 2>&1 | head -n1)" echo " mktemp: $(mktemp --version 2>&1 | head -n1)"
echo " grep: $(grep --version 2>&1 | head -n1)"
echo " diff: $(diff --version 2>&1 | head -n1)"
fi fi
echo " grep: $(grep --version 2>&1 | head -n1)"
echo " diff: $(diff --version 2>&1 | head -n1)"
echo " openssl: $("${OPENSSL}" version 2>&1)" echo " openssl: $("${OPENSSL}" version 2>&1)"
exit 0 exit 0