diff --git a/dist/codecov.sh b/dist/codecov.sh index 4b5320b..e446731 100755 --- a/dist/codecov.sh +++ b/dist/codecov.sh @@ -41,6 +41,7 @@ CODECOV_WRAPPER_VERSION="0.2.6" CODECOV_VERSION="${CODECOV_VERSION:-latest}" CODECOV_FAIL_ON_ERROR="${CODECOV_FAIL_ON_ERROR:-false}" CODECOV_RUN_CMD="${CODECOV_RUN_CMD:-upload-coverage}" +CODECOV_CLI_TYPE=${CODECOV_CLI_TYPE:-"codecov-cli"} say " _____ _ / ____| | | | | ___ __| | ___ ___ _____ __ @@ -49,6 +50,10 @@ say " _____ _ \\_____\\___/ \\__,_|\\___|\\___\\___/ \\_/ $r Wrapper-$CODECOV_WRAPPER_VERSION$x " +if [[ "$CODECOV_CLI_TYPE" != "codecov-cli" && "$CODECOV_CLI_TYPE" != "sentry-prevent-cli" ]]; then + echo "Invalid CODECOV_CLI_TYPE: '$CODECOV_CLI_TYPE'. Must be 'codecov-cli' or 'sentry-prevent-cli'" + exit 1 +fi if [ -n "$CODECOV_BINARY" ]; then if [ -f "$CODECOV_BINARY" ]; @@ -60,11 +65,11 @@ then fi elif [ "$CODECOV_USE_PYPI" == "true" ]; then - if ! pip install codecov-cli"$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION" )"; then + if ! pip install "${CODECOV_CLI_TYPE}$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION")"; then exit_if_error "Could not install via pypi." exit fi - CODECOV_COMMAND="codecovcli" + CODECOV_COMMAND="${CODECOV_CLI_TYPE}" else if [ -n "$CODECOV_OS" ]; then @@ -80,7 +85,7 @@ else [[ $(arch) == "aarch64" && $family == "linux" ]] && CODECOV_OS+="-arm64" say "$g==>$x Detected $b${CODECOV_OS}$x" fi - CODECOV_FILENAME="codecov" + CODECOV_FILENAME="${CODECOV_CLI_TYPE%-cli}" [[ $CODECOV_OS == "windows" ]] && CODECOV_FILENAME+=".exe" CODECOV_COMMAND="./$CODECOV_FILENAME" [[ $CODECOV_OS == "macos" ]] && \ @@ -129,11 +134,11 @@ fi if [ -n "$CODECOV_BINARY_LOCATION" ]; then mkdir -p "$CODECOV_BINARY_LOCATION" && mv "$CODECOV_FILENAME" $_ - say "$g==>$x Codecov binary moved to ${CODECOV_BINARY_LOCATION}" + say "$g==>$x ${CODECOV_CLI_TYPE} binary moved to ${CODECOV_BINARY_LOCATION}" fi if [ "$CODECOV_DOWNLOAD_ONLY" = "true" ]; then - say "$g==>$x Codecov download only called. Exiting..." + say "$g==>$x ${CODECOV_CLI_TYPE} download only called. Exiting..." fi CODECOV_CLI_ARGS=() CODECOV_CLI_ARGS+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM)) diff --git a/env b/env index fd6236e..4ae701c 100644 --- a/env +++ b/env @@ -3,6 +3,7 @@ CODECOV_ARGS CODECOV_BINARY CODECOV_BINARY_LOCATION CODECOV_CLI_ARGS +CODECOV_CLI_TYPE CODECOV_COMMAND CODECOV_DOWNLOAD_ONLY CODECOV_EXCLUDES diff --git a/scripts/download.sh b/scripts/download.sh index 10723df..50ea8ca 100755 --- a/scripts/download.sh +++ b/scripts/download.sh @@ -11,11 +11,11 @@ then fi elif [ "$CODECOV_USE_PYPI" == "true" ]; then - if ! pip install codecov-cli"$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION" )"; then + if ! pip install "${CODECOV_CLI_TYPE}$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION")"; then exit_if_error "Could not install via pypi." exit fi - CODECOV_COMMAND="codecovcli" + CODECOV_COMMAND="${CODECOV_CLI_TYPE}" else if [ -n "$CODECOV_OS" ]; then @@ -32,7 +32,7 @@ else say "$g==>$x Detected $b${CODECOV_OS}$x" fi - CODECOV_FILENAME="codecov" + CODECOV_FILENAME="${CODECOV_CLI_TYPE%-cli}" [[ $CODECOV_OS == "windows" ]] && CODECOV_FILENAME+=".exe" CODECOV_COMMAND="./$CODECOV_FILENAME" [[ $CODECOV_OS == "macos" ]] && \ diff --git a/scripts/set_defaults.sh b/scripts/set_defaults.sh index eecaa10..64c9352 100755 --- a/scripts/set_defaults.sh +++ b/scripts/set_defaults.sh @@ -4,6 +4,7 @@ CODECOV_WRAPPER_VERSION="0.2.6" CODECOV_VERSION="${CODECOV_VERSION:-latest}" CODECOV_FAIL_ON_ERROR="${CODECOV_FAIL_ON_ERROR:-false}" CODECOV_RUN_CMD="${CODECOV_RUN_CMD:-upload-coverage}" +CODECOV_CLI_TYPE=${CODECOV_CLI_TYPE:-"codecov-cli"} say " _____ _ / ____| | | @@ -13,3 +14,8 @@ say " _____ _ \\_____\\___/ \\__,_|\\___|\\___\\___/ \\_/ $r Wrapper-$CODECOV_WRAPPER_VERSION$x " + +if [[ "$CODECOV_CLI_TYPE" != "codecov-cli" && "$CODECOV_CLI_TYPE" != "sentry-prevent-cli" ]]; then + echo "Invalid CODECOV_CLI_TYPE: '$CODECOV_CLI_TYPE'. Must be 'codecov-cli' or 'sentry-prevent-cli'" + exit 1 +fi diff --git a/scripts/validate.sh b/scripts/validate.sh index bc4a328..f39517f 100755 --- a/scripts/validate.sh +++ b/scripts/validate.sh @@ -36,10 +36,10 @@ fi if [ -n "$CODECOV_BINARY_LOCATION" ]; then mkdir -p "$CODECOV_BINARY_LOCATION" && mv "$CODECOV_FILENAME" $_ - say "$g==>$x Codecov binary moved to ${CODECOV_BINARY_LOCATION}" + say "$g==>$x ${CODECOV_CLI_TYPE} binary moved to ${CODECOV_BINARY_LOCATION}" fi if [ "$CODECOV_DOWNLOAD_ONLY" = "true" ]; then - say "$g==>$x Codecov download only called. Exiting..." + say "$g==>$x ${CODECOV_CLI_TYPE} download only called. Exiting..." fi