Check for errors in archive download, fix --version, whitespace consistency
This commit is contained in:
parent
955b3df8bb
commit
7c1e6c86d5
|
@ -200,7 +200,7 @@ elif [ -n "${BRANCH}" ]; then
|
|||
fi
|
||||
|
||||
# Script default
|
||||
else
|
||||
elif [ -z "${VERSION}" ]; then
|
||||
VERSION="${DEFAULTVERSION}"
|
||||
fi
|
||||
|
||||
|
@ -268,20 +268,29 @@ fi
|
|||
echo " Script directory and build location: ${CURRENTPATH}"
|
||||
echo
|
||||
|
||||
# -e Abort script at first error, when a command exits with non-zero status (except in until or while loops, if-tests, list constructs)
|
||||
# -o pipefail Causes a pipeline to return the exit status of the last command in the pipe that returned a non-zero return value
|
||||
set -eo pipefail
|
||||
|
||||
# Download OpenSSL when not present
|
||||
OPENSSL_ARCHIVE_BASE_NAME=OpenSSL_${GITHUB_VERSION}
|
||||
OPENSSL_ARCHIVE_FILE_NAME=${OPENSSL_ARCHIVE_BASE_NAME}.tar.gz
|
||||
if [ ! -e ${OPENSSL_ARCHIVE_FILE_NAME} ]; then
|
||||
echo "Downloading ${OPENSSL_ARCHIVE_FILE_NAME}..."
|
||||
curl ${CURL_OPTIONS} -L -O https://github.com/openssl/openssl/archive/${OPENSSL_ARCHIVE_FILE_NAME}
|
||||
OPENSSL_ARCHIVE_URL="https://github.com/openssl/openssl/archive/${OPENSSL_ARCHIVE_FILE_NAME}"
|
||||
# -L follow Location header, -f fail silently for 4xx errors and return status 22, -O Use server-specified filename for download
|
||||
curl ${CURL_OPTIONS} -LfO "${OPENSSL_ARCHIVE_URL}"
|
||||
|
||||
# Check for success status
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "An error occured when trying to download OpenSSL ${VERSION} from ${OPENSSL_ARCHIVE_URL}."
|
||||
echo "Please check cURL's error message and/or your network connection."
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "Using ${OPENSSL_ARCHIVE_FILE_NAME}"
|
||||
fi
|
||||
|
||||
# -e Abort script at first error, when a command exits with non-zero status (except in until or while loops, if-tests, list constructs)
|
||||
# -o pipefail Causes a pipeline to return the exit status of the last command in the pipe that returned a non-zero return value
|
||||
set -eo pipefail
|
||||
|
||||
# Clean up target directories if requested and present
|
||||
if [ "${CLEANUP}" == "true" ]; then
|
||||
if [ -d "${CURRENTPATH}/bin" ]; then
|
||||
|
|
Loading…
Reference in New Issue