Skip to content

Commit 596fe93

Browse files
committed
feat: allow for config of which CLI to use
1 parent 9fa0f80 commit 596fe93

File tree

5 files changed

+27
-13
lines changed

5 files changed

+27
-13
lines changed

dist/codecov.sh

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ say " _____ _
4949
\\_____\\___/ \\__,_|\\___|\\___\\___/ \\_/
5050
$r Wrapper-$CODECOV_WRAPPER_VERSION$x
5151
"
52+
CODECOV_CLI_TYPE=${CODECOV_CLI_TYPE:-"codecov"}
53+
if [[ "$CODECOV_CLI_TYPE" != "codecov" && "$CODECOV_CLI_TYPE" != "prevent" ]]; then
54+
echo "Invalid CODECOV_CLI_TYPE: '$CODECOV_CLI_TYPE'. Must be 'codecov' or 'prevent'"
55+
exit 1
56+
fi
5257
if [ -n "$CODECOV_BINARY" ];
5358
then
5459
if [ -f "$CODECOV_BINARY" ];
@@ -60,11 +65,11 @@ then
6065
fi
6166
elif [ "$CODECOV_USE_PYPI" == "true" ];
6267
then
63-
if ! pip install codecov-cli"$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION" )"; then
68+
if ! pip install "${CODECOV_CLI_TYPE}-cli$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION")"; then
6469
exit_if_error "Could not install via pypi."
6570
exit
6671
fi
67-
CODECOV_COMMAND="codecovcli"
72+
CODECOV_COMMAND="${CODECOV_CLI_TYPE}cli"
6873
else
6974
if [ -n "$CODECOV_OS" ];
7075
then
@@ -80,8 +85,8 @@ else
8085
[[ $(arch) == "aarch64" && $family == "linux" ]] && CODECOV_OS+="-arm64"
8186
say "$g==>$x Detected $b${CODECOV_OS}$x"
8287
fi
83-
CODECOV_FILENAME="codecov"
84-
[[ $CODECOV_OS == "windows" ]] && CODECOV_FILENAME+=".exe"
88+
CODECOV_FILENAME="${CODECOV_CLI_TYPE}"
89+
[[ $CODECOV_OS == "windows" ]] && codecov_filename+=".exe"
8590
CODECOV_COMMAND="./$CODECOV_FILENAME"
8691
[[ $CODECOV_OS == "macos" ]] && \
8792
! command -v gpg 2>&1 >/dev/null && \
@@ -129,11 +134,11 @@ fi
129134
if [ -n "$CODECOV_BINARY_LOCATION" ];
130135
then
131136
mkdir -p "$CODECOV_BINARY_LOCATION" && mv "$CODECOV_FILENAME" $_
132-
say "$g==>$x Codecov binary moved to ${CODECOV_BINARY_LOCATION}"
137+
say "$g==>$x ${CODECOV_CLI_TYPE} binary moved to ${CODECOV_BINARY_LOCATION}"
133138
fi
134139
if [ "$CODECOV_DOWNLOAD_ONLY" = "true" ];
135140
then
136-
say "$g==>$x Codecov download only called. Exiting..."
141+
say "$g==>$x ${CODECOV_CLI_TYPE} download only called. Exiting..."
137142
fi
138143
CODECOV_CLI_ARGS=()
139144
CODECOV_CLI_ARGS+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))

env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ CODECOV_ARGS
33
CODECOV_BINARY
44
CODECOV_BINARY_LOCATION
55
CODECOV_CLI_ARGS
6+
CODECOV_CLI_TYPE
67
CODECOV_COMMAND
78
CODECOV_DOWNLOAD_ONLY
89
CODECOV_EXCLUDES

scripts/download.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ then
1111
fi
1212
elif [ "$CODECOV_USE_PYPI" == "true" ];
1313
then
14-
if ! pip install codecov-cli"$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION" )"; then
14+
if ! pip install "${CODECOV_CLI_TYPE}-cli$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION")"; then
1515
exit_if_error "Could not install via pypi."
1616
exit
1717
fi
18-
CODECOV_COMMAND="codecovcli"
18+
19+
CODECOV_COMMAND="${CODECOV_CLI_TYPE}cli"
1920
else
2021
if [ -n "$CODECOV_OS" ];
2122
then
@@ -32,9 +33,9 @@ else
3233
say "$g==>$x Detected $b${CODECOV_OS}$x"
3334
fi
3435

35-
CODECOV_FILENAME="codecov"
36-
[[ $CODECOV_OS == "windows" ]] && CODECOV_FILENAME+=".exe"
37-
CODECOV_COMMAND="./$CODECOV_FILENAME"
36+
CODECOV_FILENAME="${CODECOV_CLI_TYPE}"
37+
[[ $CODECOV_OS == "windows" ]] && codecov_filename+=".exe"
38+
codecov_command="./$CODECOV_FILENAME"
3839
[[ $CODECOV_OS == "macos" ]] && \
3940
! command -v gpg 2>&1 >/dev/null && \
4041
HOMEBREW_NO_AUTO_UPDATE=1 brew install gpg

scripts/set_defaults.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,10 @@ say " _____ _
1313
\\_____\\___/ \\__,_|\\___|\\___\\___/ \\_/
1414
$r Wrapper-$CODECOV_WRAPPER_VERSION$x
1515
"
16+
17+
CODECOV_CLI_TYPE=${CODECOV_CLI_TYPE:-"codecov"}
18+
19+
if [[ "$CODECOV_CLI_TYPE" != "codecov" && "$CODECOV_CLI_TYPE" != "prevent" ]]; then
20+
echo "Invalid CODECOV_CLI_TYPE: '$CODECOV_CLI_TYPE'. Must be 'codecov' or 'prevent'"
21+
exit 1
22+
fi

scripts/validate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ fi
3636
if [ -n "$CODECOV_BINARY_LOCATION" ];
3737
then
3838
mkdir -p "$CODECOV_BINARY_LOCATION" && mv "$CODECOV_FILENAME" $_
39-
say "$g==>$x Codecov binary moved to ${CODECOV_BINARY_LOCATION}"
39+
say "$g==>$x ${CODECOV_CLI_TYPE} binary moved to ${CODECOV_BINARY_LOCATION}"
4040
fi
4141

4242
if [ "$CODECOV_DOWNLOAD_ONLY" = "true" ];
4343
then
44-
say "$g==>$x Codecov download only called. Exiting..."
44+
say "$g==>$x ${CODECOV_CLI_TYPE} download only called. Exiting..."
4545
fi

0 commit comments

Comments
 (0)