starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-05-16 11:57:01 +02:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

temporarily store raw curl version output to fix check (fixes #717)

Browse Source
This commit is contained in:
Lukas Schauer
2020-04-28 20:58:46 +02:00
parent 229f7186a6
commit 4fd4d4d3c2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dehydrated
View File

@@ -47,13 +47,15 @@ check_dependencies() {
command -v diff > /dev/null 2>&1 || _exiterr "This script requires diff." command -v diff > /dev/null 2>&1 || _exiterr "This script requires diff."
# curl returns with an error code in some ancient versions so we have to catch that # curl returns with an error code in some ancient versions so we have to catch that
# storing raw version output temporarily to catch curl error instead of head/awk exit codes
set +e set +e
CURL_VERSION="$(curl -V 2>&1 | head -n1 | awk '{print $2}')" raw_curl_version="$(curl -V 2>&1)"
retcode="$?" retcode="$?"
set -e set -e
if [[ ! "${retcode}" = "0" ]] && [[ ! "${retcode}" = "2" ]]; then if [[ ! "${retcode}" = "0" ]] && [[ ! "${retcode}" = "2" ]]; then
_exiterr "This script requires curl." _exiterr "This script requires curl."
fi fi
CURL_VERSION="$(head -n1 <<< "${raw_curl_version}" | awk '{print $2}')"
} }
store_configvars() { store_configvars() {