Prevent error message involving CLI arguments in case there's a failure in verifySupported

- This is very confusing because the failure is unrelated to the specified CLI arguments

Signed-off-by: Karl-Philipp Richter <krichter@posteo.de>
pull/12751/head
Karl-Philipp Richter 2 years ago
parent e81f6140dd
commit 553996d572

@ -25,6 +25,8 @@
: ${HELM_INSTALL_DIR:="/usr/local/bin"} : ${HELM_INSTALL_DIR:="/usr/local/bin"}
: ${GPG_PUBRING:="pubring.kbx"} : ${GPG_PUBRING:="pubring.kbx"}
EXIT_VERIFY_FAILED=2
HAS_CURL="$(type "curl" &> /dev/null && echo true || echo false)" HAS_CURL="$(type "curl" &> /dev/null && echo true || echo false)"
HAS_WGET="$(type "wget" &> /dev/null && echo true || echo false)" HAS_WGET="$(type "wget" &> /dev/null && echo true || echo false)"
HAS_OPENSSL="$(type "openssl" &> /dev/null && echo true || echo false)" HAS_OPENSSL="$(type "openssl" &> /dev/null && echo true || echo false)"
@ -72,30 +74,30 @@ verifySupported() {
if ! echo "${supported}" | grep -q "${OS}-${ARCH}"; then if ! echo "${supported}" | grep -q "${OS}-${ARCH}"; then
echo "No prebuilt binary for ${OS}-${ARCH}." echo "No prebuilt binary for ${OS}-${ARCH}."
echo "To build from source, go to https://github.com/helm/helm" echo "To build from source, go to https://github.com/helm/helm"
exit 1 exit $EXIT_VERIFY_FAILED
fi fi
if [ "${HAS_CURL}" != "true" ] && [ "${HAS_WGET}" != "true" ]; then if [ "${HAS_CURL}" != "true" ] && [ "${HAS_WGET}" != "true" ]; then
echo "Either curl or wget is required" echo "Either curl or wget is required"
exit 1 exit $EXIT_VERIFY_FAILED
fi fi
if [ "${VERIFY_CHECKSUM}" == "true" ] && [ "${HAS_OPENSSL}" != "true" ]; then if [ "${VERIFY_CHECKSUM}" == "true" ] && [ "${HAS_OPENSSL}" != "true" ]; then
echo "In order to verify checksum, openssl must first be installed." echo "In order to verify checksum, openssl must first be installed."
echo "Please install openssl or set VERIFY_CHECKSUM=false in your environment." echo "Please install openssl or set VERIFY_CHECKSUM=false in your environment."
exit 1 exit $EXIT_VERIFY_FAILED
fi fi
if [ "${VERIFY_SIGNATURES}" == "true" ]; then if [ "${VERIFY_SIGNATURES}" == "true" ]; then
if [ "${HAS_GPG}" != "true" ]; then if [ "${HAS_GPG}" != "true" ]; then
echo "In order to verify signatures, gpg must first be installed." echo "In order to verify signatures, gpg must first be installed."
echo "Please install gpg or set VERIFY_SIGNATURES=false in your environment." echo "Please install gpg or set VERIFY_SIGNATURES=false in your environment."
exit 1 exit $EXIT_VERIFY_FAILED
fi fi
if [ "${OS}" != "linux" ]; then if [ "${OS}" != "linux" ]; then
echo "Signature verification is currently only supported on Linux." echo "Signature verification is currently only supported on Linux."
echo "Please set VERIFY_SIGNATURES=false or verify the signatures manually." echo "Please set VERIFY_SIGNATURES=false or verify the signatures manually."
exit 1 exit $EXIT_VERIFY_FAILED
fi fi
fi fi
@ -246,7 +248,9 @@ verifySignatures() {
fail_trap() { fail_trap() {
result=$? result=$?
if [ "$result" != "0" ]; then if [ "$result" != "0" ]; then
if [[ -n "$INPUT_ARGUMENTS" ]]; then if [[ "$result" = "$EXIT_VERIFY_FAILED" ]]; then
echo "The script failed the installation parameter validation"
elif [[ -n "$INPUT_ARGUMENTS" ]]; then
echo "Failed to install $BINARY_NAME with the arguments provided: $INPUT_ARGUMENTS" echo "Failed to install $BINARY_NAME with the arguments provided: $INPUT_ARGUMENTS"
help help
else else

Loading…
Cancel
Save