Skip to content

Commit 3958966

Browse files
HariSekhonHariSekhon
committed
updated curl_auth.sh paths
1 parent 310820b commit 3958966

32 files changed

+40
-40
lines changed

‎appveyor/appveyor_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ shift || :
5454

5555
export TOKEN="$APPVEYOR_TOKEN"
5656

57-
"$srcdir/curl_auth.sh" -sS --fail "https://ci.appveyor.com/api/$url_path" "$@"
57+
"$srcdir/../bin/curl_auth.sh" -sS --fail "https://ci.appveyor.com/api/$url_path" "$@"

‎azure_devops/azure_devops_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,4 @@ url_path="${url_path/:repo/$repo}"
161161
url_path="${url_path/<repo>/$repo}"
162162
url_path="${url_path/\{repo\}/$repo}"
163163

164-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
164+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"

‎bigdata/cloudera_manager_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ shift || :
6767
# https://docs.cloudera.com/documentation/enterprise/6/6.3/topics/cn_navigator_api_overview.html#api-version-compatility
6868
api_version="${CLOUDERA_API_VERSION:-7}"
6969

70-
"$srcdir/curl_auth.sh" "$CLOUDERA_MANAGER/api/v${api_version}${url_path}" -sS --fail --connect-timeout 5 "$@"
70+
"$srcdir/../bin/curl_auth.sh" "$CLOUDERA_MANAGER/api/v${api_version}${url_path}" -sS --fail --connect-timeout 5 "$@"

‎bigdata/cloudera_navigator_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ shift || :
6969

7070
api_version="${CLOUDERA_API_VERSION:-10}"
7171

72-
"$srcdir/curl_auth.sh" "$CLOUDERA_NAVIGATOR/api/v${api_version}${url_path}" -sS --fail --connect-timeout 5 "$@"
72+
"$srcdir/../bin/curl_auth.sh" "$CLOUDERA_NAVIGATOR/api/v${api_version}${url_path}" -sS --fail --connect-timeout 5 "$@"

‎buildkite/buildkite_api.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export TOKEN="$BUILDKITE_TOKEN"
8484
BUILDKITE_ORGANIZATION="${BUILDKITE_ORGANIZATION:-${BUILDKITE_USER:-}}"
8585

8686
if [[ "$url_path" =~ {organization} ]]; then
87-
organizations="$("$srcdir/curl_auth.sh" -sS --fail "$url_base/organizations" | jq -r '.[].slug')"
87+
organizations="$("$srcdir/../bin/curl_auth.sh" -sS --fail "$url_base/organizations" | jq -r '.[].slug')"
8888
num_organizations="$(wc -w <<< "$organizations" | sed 's/[[:space:]]//g')"
8989
if [ "$num_organizations" -eq 0 ]; then
9090
usage "\$BUILDKITE_ORGANIZATION / \$BUILDKITE_USER not set and could not find any organizations for the \$BUILDKITE_TOKEN"
@@ -103,4 +103,4 @@ if [[ "$url_path" =~ {pipeline} ]]; then
103103
url_path="${url_path//\{pipeline\}/$BUILDKITE_PIPELINE}"
104104
fi
105105

106-
"$srcdir/curl_auth.sh" -sS --fail "$url_base/$url_path" "$@"
106+
"$srcdir/../bin/curl_auth.sh" -sS --fail "$url_base/$url_path" "$@"

‎checks/check_jenkinsfiles.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ fi
6969

7070
JENKINS_URL="${JENKINS_URL%%/}"
7171

72-
#crumb="$("$srcdir/curl_auth.sh" -sS --fail "$JENKINS_URL/crumbIssuer/api/json" | jq -r '.crumb')"
72+
#crumb="$("$srcdir/../bin/curl_auth.sh" -sS --fail "$JENKINS_URL/crumbIssuer/api/json" | jq -r '.crumb')"
7373

7474
echo "Validating Jenkinsfiles:"
7575
echo
7676
while read -r jenkinsfile; do
7777
echo -n "$jenkinsfile => "
78-
#"$srcdir/curl_auth.sh" "$JENKINS_URL/pipeline-model-converter/validate" -sS --fail -X POST -F "jenkinsfile=<Jenkinsfile" -H "Jenkins-Crumb: $crumb"
78+
#"$srcdir/../bin/curl_auth.sh" "$JENKINS_URL/pipeline-model-converter/validate" -sS --fail -X POST -F "jenkinsfile=<Jenkinsfile" -H "Jenkins-Crumb: $crumb"
7979
#"$srcdir/jenkins_api.sh" "/pipeline-model-converter/validate" -X POST -F "jenkinsfile=<Jenkinsfile"
8080
#"$srcdir/jenkins_api.sh" "/pipeline-model-converter/validate" -X POST -F "jenkinsfile=<$jenkinsfile"
8181
# 'export JENKINS_CLI_ARGS=-webSocket' is needed if Jenkins is behind a reverse proxy such as Kubernetes Ingress, otherwise Jenkins CLI hangs

‎cicd/gerrit_projects.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ curl_auth(){
8282
shift || :
8383
# need opt splitting
8484
# shellcheck disable=SC2086
85-
"$srcdir/curl_auth.sh" "$base_url/$url_path" -H 'Content-type: application/json' "$@" $curl_options |
85+
"$srcdir/../bin/curl_auth.sh" "$base_url/$url_path" -H 'Content-type: application/json' "$@" $curl_options |
8686
bugfix_gerrit_api_output
8787
}
8888

‎cicd/gocd_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ url_base+="/go/api"
105105

106106
if [ -n "${GOCD_TOKEN:-}" ]; then
107107
export TOKEN="$GOCD_TOKEN"
108-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
108+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
109109
else
110110
curl "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
111111
fi

‎cicd/jira_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,4 @@ fi
9696
url_path="${url_path//$url_base}"
9797
url_path="${url_path##/}"
9898

99-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
99+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"

‎cicd/octopus_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,5 @@ export CURL_AUTH_HEADER="X-Octopus-ApiKey:"
9292

9393
url_base="$OCTOPUS_URL/api"
9494

95-
"$srcdir/curl_auth.sh" "$url_base/$url_path" ${CURL_OPTS:+"${CURL_OPTS[@]}"} "$@" |
95+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" ${CURL_OPTS:+"${CURL_OPTS[@]}"} "$@" |
9696
jq_debug_pipe_dump

‎circleci/circleci_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,4 @@ url_path="${url_path##/}"
153153
#url_path="${url_path/<repo>/$repo}"
154154
#url_path="${url_path/\{repo\}/$repo}"
155155

156-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
156+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"

‎cloudflare/cloudflare_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@ url_path="${url_path##/}"
167167

168168
export TOKEN="$CLOUDFLARE_TOKEN"
169169

170-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
170+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"

‎cloudflare/cloudflare_purge_cache.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export TOKEN="$CLOUDFLARE_TOKEN"
5454
#-H "X-Auth-Key: $CLOUDFLARE_TOKEN" \
5555

5656
output="$(
57-
"$srcdir/curl_auth.sh" "https://api.cloudflare.com/client/v4/zones/$zone_id/purge_cache" \
57+
"$srcdir/../bin/curl_auth.sh" "https://api.cloudflare.com/client/v4/zones/$zone_id/purge_cache" \
5858
-sS -X POST \
5959
-H "Content-Type: application/json" \
6060
-H "X-Auth-Email: $CLOUDFLARE_EMAIL" \

‎codeship/codeship_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,4 @@ fi
144144
# unset to return to default setting for safety to avoid hard to debug changes of behaviour elsewhere
145145
shopt -u nocasematch
146146

147-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
147+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"

‎codeship/codeship_api_token.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export USER="$user"
5050
export PASSWORD="$CODESHIP_PASSWORD"
5151

5252
# has to be basic auth, don't allow token to be used as it will result in a 401
53-
output="$(NO_TOKEN_AUTH=1 "$srcdir/curl_auth.sh" https://api.codeship.com/v2/auth -X POST "${CURL_OPTS[@]}" "$@")"
53+
output="$(NO_TOKEN_AUTH=1 "$srcdir/../bin/curl_auth.sh" https://api.codeship.com/v2/auth -X POST "${CURL_OPTS[@]}" "$@")"
5454

5555
die_if_error_field "$output"
5656

‎docker/docker_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ shift || :
7676
if [[ "$url" =~ hub.docker.com ]]; then
7777
"$srcdir/dockerhub_api.sh" "$url" "$@"
7878
elif [ -n "${PASSWORD:-}" ]; then
79-
"$srcdir/curl_auth.sh" "$url" "${CURL_OPTS[@]}" "$@"
79+
"$srcdir/../bin/curl_auth.sh" "$url" "${CURL_OPTS[@]}" "$@"
8080
else
8181
curl "$url" "${CURL_OPTS[@]}" "$@"
8282
fi

‎docker/dockerhub_api.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ if [ -n "${PASSWORD:-}" ]; then
9393
# since DockerHub has many different API addresses it's easier to use JWT which isn't limited to a predefined service address
9494
JWT=1
9595
if [ -n "${JWT:-}" ]; then
96-
#output="$("$srcdir/curl_auth.sh" https://hub.docker.com/v2/users/login/ \
96+
#output="$("$srcdir/../bin/curl_auth.sh" https://hub.docker.com/v2/users/login/ \
9797
output="$(curl https://hub.docker.com/v2/users/login/ \
9898
-X POST \
9999
"${CURL_OPTS[@]}" \
@@ -112,7 +112,7 @@ if [ -n "${PASSWORD:-}" ]; then
112112
export JWT_TOKEN="$token"
113113
else
114114
# OAuth2
115-
output="$("$srcdir/curl_auth.sh" https://auth.docker.io/token -X GET \
115+
output="$("$srcdir/../bin/curl_auth.sh" https://auth.docker.io/token -X GET \
116116
-H 'Content-Type: application/x-www-form-urlencoded' \
117117
-H 'Www-Authenticate: Bearer realm="https://auth.docker.io/token",service="hub.docker.com"' \
118118
-d "grant_type=password&access_type=online&client_id=${0##*}&service=hub.docker.com" # alternative: registry.docker.io
@@ -125,7 +125,7 @@ if [ -n "${PASSWORD:-}" ]; then
125125
if [ -z "$token" ] || [ "$token" = null ]; then
126126
die "Authentication failed: $output"
127127
fi
128-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
128+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
129129
else
130130
# proceed without authentication
131131
curl "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"

‎drone/drone_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ export TOKEN="$DRONE_TOKEN"
9090
# this works
9191
#curl "${CURL_OPTS[@]}" -H @<(cat <<< "Authorization: Bearer $DRONE_TOKEN") "$url_base/$url_path" "$@"
9292

93-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
93+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"

‎git/bitbucket_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,4 @@ url_path="${url_path/\{repo\}/$repo}"
202202
url_path="${url_path/<repo>/$repo}"
203203
url_path="${url_path/:repo/$repo}"
204204

205-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
205+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"

‎git/gitguardian_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,5 @@ export TOKEN="$GITGUARDIAN_TOKEN"
9999

100100
export CURL_AUTH_HEADER="Authorization: Token"
101101

102-
"$srcdir/curl_auth.sh" "$url_base/$url_path" ${CURL_OPTS:+"${CURL_OPTS[@]}"} "$@" |
102+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" ${CURL_OPTS:+"${CURL_OPTS[@]}"} "$@" |
103103
jq_debug_pipe_dump

‎git/github_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,5 +150,5 @@ url_path="${url_path/:repo/$repo}"
150150
url_path="${url_path/<repo>/$repo}"
151151
#url_path="${url_path/\{repo\}/$repo}"
152152

153-
"$srcdir/curl_auth.sh" "$url_base/$url_path" ${CURL_OPTS:+"${CURL_OPTS[@]}"} "$@" |
153+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" ${CURL_OPTS:+"${CURL_OPTS[@]}"} "$@" |
154154
jq_debug_pipe_dump

‎git/gitlab_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,4 @@ export TOKEN="$GITLAB_TOKEN"
210210
# can also leave out to use OAuth compliant header "Authorization: Bearer <token>"
211211
export CURL_AUTH_HEADER="Private-Token:"
212212

213-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
213+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"

‎jenkins/jenkins_api.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ if [ -n "${JENKINS_TOKEN:-}" ]; then
8989
export PASSWORD="$JENKINS_TOKEN"
9090
else
9191
export PASSWORD="${JENKINS_PASSWORD:-${JENKINS_TOKEN:-}}"
92-
crumb="$("$srcdir/curl_auth.sh" -sS --fail "$JENKINS_URL/crumbIssuer/api/json" | jq -r '.crumb')"
92+
crumb="$("$srcdir/../bin/curl_auth.sh" -sS --fail "$JENKINS_URL/crumbIssuer/api/json" | jq -r '.crumb')"
9393
CURL_OPTS+=(-H "Jenkins-Crumb: $crumb")
9494
fi
9595

96-
"$srcdir/curl_auth.sh" "$JENKINS_URL/$url_path" ${CURL_OPTS:+"${CURL_OPTS[@]}"} "$@"
96+
"$srcdir/../bin/curl_auth.sh" "$JENKINS_URL/$url_path" ${CURL_OPTS:+"${CURL_OPTS[@]}"} "$@"

‎kubernetes/kubernetes_api.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ shift || :
5151
export TOKEN="$token"
5252

5353
# XXX: have to use -k to not verify the certificate here because often it is self-signed
54-
#"$srcdir/curl_auth.sh" -k "$api_server$path" "$@"
55-
"$srcdir/curl_auth.sh" "$api_server$path" "$@"
54+
#"$srcdir/../bin/curl_auth.sh" -k "$api_server$path" "$@"
55+
"$srcdir/../bin/curl_auth.sh" "$api_server$path" "$@"

‎pingdom/pingdom_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ url_path="${url_path##/}"
129129

130130
export TOKEN="$PINGDOM_TOKEN"
131131

132-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
132+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
133133

134134
# args: /checks | jq .
135135
# args: /checks/<check_id>

‎shippable/shippable_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ export TOKEN="$SHIPPABLE_TOKEN"
4444
# non-standard auth header
4545
export CURL_AUTH_HEADER="Authorization: apiToken"
4646

47-
"$srcdir/curl_auth.sh" -sS --fail "https://api.shippable.com/$url_path" "$@"
47+
"$srcdir/../bin/curl_auth.sh" -sS --fail "https://api.shippable.com/$url_path" "$@"

‎spotify/spotify_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ export TOKEN="$SPOTIFY_ACCESS_TOKEN"
7171

7272
# the Spotify API is very unreliable and often gets 502 errors
7373
# seen 20 x HTTP 500 errors from the API in a row :-/
74-
MAX_RETRIES="30" retry 300 "$srcdir/curl_auth.sh" -sSL --fail "$url_base/$url_path" "$@"
74+
MAX_RETRIES="30" retry 300 "$srcdir/../bin/curl_auth.sh" -sSL --fail "$url_base/$url_path" "$@"

‎spotify/spotify_api_token.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ scope="$(tr '\n' '+' <<< "$scope" | sed 's/^+//; s/+*$//')"
9797
# https://developer.spotify.com/documentation/general/guides/authorization-guide/#client-credentials-flow
9898
#
9999
if is_blank "${SPOTIFY_PRIVATE:-}"; then
100-
output="$(NO_TOKEN_AUTH=1 USERNAME="$SPOTIFY_ID" PASSWORD="$SPOTIFY_SECRET" "$srcdir/curl_auth.sh" -sSL -X 'POST' -d 'grant_type=client_credentials' -d "scope=$scope" https://accounts.spotify.com/api/token "$@")"
100+
output="$(NO_TOKEN_AUTH=1 USERNAME="$SPOTIFY_ID" PASSWORD="$SPOTIFY_SECRET" "$srcdir/../bin/curl_auth.sh" -sSL -X 'POST' -d 'grant_type=client_credentials' -d "scope=$scope" https://accounts.spotify.com/api/token "$@")"
101101
fi
102102

103103
# ============================================================================ #
@@ -172,7 +172,7 @@ EOF
172172
#curl -H "Authorization: Basic $basic_auth_token" -d grant_type=authorization_code -d code="$code" -d redirect_uri="$redirect_uri" https://accounts.spotify.com/api/token
173173
# curl_auth.sh prevents auth token appearing in process list
174174
local output
175-
output="$(NO_TOKEN_AUTH=1 USERNAME="$SPOTIFY_ID" PASSWORD="$SPOTIFY_SECRET" "$srcdir/curl_auth.sh" https://accounts.spotify.com/api/token -sSL -d grant_type=authorization_code -d code="$code" -d redirect_uri="$redirect_uri")"
175+
output="$(NO_TOKEN_AUTH=1 USERNAME="$SPOTIFY_ID" PASSWORD="$SPOTIFY_SECRET" "$srcdir/../bin/curl_auth.sh" https://accounts.spotify.com/api/token -sSL -d grant_type=authorization_code -d code="$code" -d redirect_uri="$redirect_uri")"
176176

177177
# output everything that isn't the token to stderr as it's almost certainly user information or errors and we don't want that to be captured by client scripts
178178
} >&2

‎teamcity/teamcity_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ if [ -n "${TEAMCITY_SUPERUSER_TOKEN:-}" ]; then
225225
# XXX: superuser token can only be used with blank user which cannot be used with curl_auth.sh
226226
curl -u ":$TEAMCITY_SUPERUSER_TOKEN" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
227227
else
228-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
228+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
229229
fi
230230
#chmod 0600 "$cookie_jar"
231231

‎teamcity/teamcity_upload_ssh_key.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ teamcity_curl_auth(){
8282
# XXX: superuser token can only be used with blank user which cannot be used with curl_auth.sh
8383
curl -u ":$TEAMCITY_SUPERUSER_TOKEN" "$url_base/$url_path" "${curl_opts[@]}" "$@"
8484
else
85-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${curl_opts[@]}" "$@"
85+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${curl_opts[@]}" "$@"
8686
fi
8787
}
8888

‎terraform/terraform_cloud_api.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ if [[ "$url_path" =~ [\{:]?user(_?id)?\}? ]]; then
197197
url_path="${url_path//\{userid\}/$TERRAFORM_USER_ID}"
198198
url_path="${url_path//\{user_id\}/$TERRAFORM_USER_ID}"
199199
else
200-
user_id="$("$srcdir/curl_auth.sh" "${CURL_OPTS[@]}" "$url_base/account/details" | jq -r .data.id)"
200+
user_id="$("$srcdir/../bin/curl_auth.sh" "${CURL_OPTS[@]}" "$url_base/account/details" | jq -r .data.id)"
201201
url_path="${url_path//:user_id/$user_id}"
202202
url_path="${url_path//:userid/$user_id}"
203203
url_path="${url_path//:user/$user_id}"
@@ -207,4 +207,4 @@ if [[ "$url_path" =~ [\{:]?user(_?id)?\}? ]]; then
207207
fi
208208
fi
209209

210-
"$srcdir/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"
210+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" "${CURL_OPTS[@]}" "$@"

‎travis/travis_api.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,4 @@ url_path="${url_path##/}"
135135

136136
export CURL_AUTH_HEADER="Authorization: token"
137137

138-
"$srcdir/curl_auth.sh" "$url_base/$url_path" -H 'Travis-API-Version: 3' "${CURL_OPTS[@]}" "$@"
138+
"$srcdir/../bin/curl_auth.sh" "$url_base/$url_path" -H 'Travis-API-Version: 3' "${CURL_OPTS[@]}" "$@"

0 commit comments

Comments
 (0)