Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

URI decode bottle filename before uploading #281

Merged
merged 1 commit into from
Sep 22, 2020
Merged

URI decode bottle filename before uploading #281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jenkins-scripts/lib/repository_uploader.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ upload_dsc_package()
echo "MARK_BUILD_UNSTABLE"
}

NEEDED_HOST_PACKAGES="reprepro openssh-client jq"
NEEDED_HOST_PACKAGES="reprepro openssh-client jq gridsite-clients"
QUERY_HOST_PACKAGES=$(dpkg-query -Wf'${db:Status-abbrev}' ${NEEDED_HOST_PACKAGES} 2>&1) || true
if [[ -n ${QUERY_HOST_PACKAGES} ]]; then
sudo apt-get update
Expand Down Expand Up @@ -162,7 +162,7 @@ done
# .bottle | brew binaries
for pkg in `find "$pkgs_path" -name '*.bottle*.json'`; do
# Extract bottle name and root_url from json file
bottle_filename=$(dirname $pkg)/$(jq -r '.[]["bottle"]["tags"][]["filename"]' < $pkg)
bottle_filename=$(urlencode -d $(dirname $pkg)/$(jq -r '.[]["bottle"]["tags"][]["filename"]' < $pkg))
root_url=$(jq -r '.[]["bottle"]["root_url"]' < $pkg)
s3_directory=${root_url#https://osrf-distributions\.s3\.amazonaws\.com/}

Expand Down