fix: address feedback

Author: joseph-sentry

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,9 +50,8 @@ say "     _____          _
     \\_____\\___/ \\__,_|\\___|\\___\\___/ \\_/
                            $r Wrapper-$CODECOV_WRAPPER_VERSION$x
                            "
-CODECOV_CLI_TYPE=${CODECOV_CLI_TYPE:-"codecov"}
-if [[ "$CODECOV_CLI_TYPE" != "codecov" && "$CODECOV_CLI_TYPE" != "prevent" ]]; then
-  echo "Invalid CODECOV_CLI_TYPE: '$CODECOV_CLI_TYPE'. Must be 'codecov' or 'prevent'"
+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" ];
@@ -65,11 +65,11 @@ then
   fi
 elif [ "$CODECOV_USE_PYPI" == "true" ];
 then
-  if ! pip install "${CODECOV_CLI_TYPE}-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="${CODECOV_CLI_TYPE}cli"
+  CODECOV_COMMAND="${CODECOV_CLI_TYPE}"
 else
   if [ -n "$CODECOV_OS" ];
   then
@@ -85,8 +85,8 @@ else
     [[ $(arch) == "aarch64" && $family == "linux" ]] && CODECOV_OS+="-arm64"
     say "$g==>$x Detected $b${CODECOV_OS}$x"
   fi
-  CODECOV_FILENAME="${CODECOV_CLI_TYPE}"
-  [[ $CODECOV_OS == "windows" ]] && codecov_filename+=".exe"
+  CODECOV_FILENAME="${CODECOV_CLI_TYPE%-cli}"
+  [[ $CODECOV_OS == "windows" ]] && CODECOV_FILENAME+=".exe"
   CODECOV_COMMAND="./$CODECOV_FILENAME"
   [[ $CODECOV_OS == "macos" ]]  && \
     ! command -v gpg 2>&1 >/dev/null && \

scripts/download.sh

@@ -11,12 +11,11 @@ then
   fi
 elif [ "$CODECOV_USE_PYPI" == "true" ];
 then
-  if ! pip install "${CODECOV_CLI_TYPE}-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="${CODECOV_CLI_TYPE}cli"
+  CODECOV_COMMAND="${CODECOV_CLI_TYPE}"
 else
   if [ -n "$CODECOV_OS" ];
   then
@@ -33,9 +32,9 @@ else
     say "$g==>$x Detected $b${CODECOV_OS}$x"
   fi
 
-  CODECOV_FILENAME="${CODECOV_CLI_TYPE}"
-  [[ $CODECOV_OS == "windows" ]] && codecov_filename+=".exe"
-  codecov_command="./$CODECOV_FILENAME"
+  CODECOV_FILENAME="${CODECOV_CLI_TYPE%-cli}"
+  [[ $CODECOV_OS == "windows" ]] && CODECOV_FILENAME+=".exe"
+  CODECOV_COMMAND="./$CODECOV_FILENAME"
   [[ $CODECOV_OS == "macos" ]]  && \
     ! command -v gpg 2>&1 >/dev/null && \
     HOMEBREW_NO_AUTO_UPDATE=1 brew install gpg

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 "     _____          _
     / ____|        | |
@@ -14,9 +15,7 @@ say "     _____          _
                            $r Wrapper-$CODECOV_WRAPPER_VERSION$x
                            "
 
-CODECOV_CLI_TYPE=${CODECOV_CLI_TYPE:-"codecov"}
-
-if [[ "$CODECOV_CLI_TYPE" != "codecov" && "$CODECOV_CLI_TYPE" != "prevent" ]]; then
-  echo "Invalid CODECOV_CLI_TYPE: '$CODECOV_CLI_TYPE'. Must be 'codecov' or 'prevent'"
+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