Skip to content

Commit 59f2ac1

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents efdb216 + ced2c82 commit 59f2ac1

2 files changed

Lines changed: 63 additions & 0 deletions

File tree

scripts/.util/tools.sh

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,64 @@ function util::tools::libpak-tools::install () {
336336
fi
337337
}
338338

339+
function util::tools::libpak-tools::install () {
340+
local dir token
341+
token=""
342+
343+
while [[ "${#}" != 0 ]]; do
344+
case "${1}" in
345+
--directory)
346+
dir="${2}"
347+
shift 2
348+
;;
349+
350+
--token)
351+
token="${2}"
352+
shift 2
353+
;;
354+
355+
*)
356+
util::print::error "unknown argument \"${1}\""
357+
esac
358+
done
359+
360+
mkdir -p "${dir}"
361+
util::tools::path::export "${dir}"
362+
363+
364+
if [[ ! -f "${dir}/libpak-tools" ]]; then
365+
local version curl_args os arch
366+
367+
version="$(jq -r .libpaktools "$(dirname "${BASH_SOURCE[0]}")/tools.json")"
368+
369+
curl_args=(
370+
"--fail"
371+
"--silent"
372+
"--location"
373+
"--output" "${dir}/libpak-tools.tar.gz"
374+
)
375+
376+
if [[ "${token}" != "" ]]; then
377+
curl_args+=("--header" "Authorization: Token ${token}")
378+
fi
379+
380+
util::print::title "Installing libpak-tools ${version}"
381+
382+
os=$(util::tools::os)
383+
arch=$(util::tools::arch --format-amd64-x86_64)
384+
385+
curl "https://github.com/paketo-buildpacks/libpak-tools/releases/download/${version}/libpak-tools_${os}_${arch}.tar.gz" \
386+
"${curl_args[@]}"
387+
388+
tar -xzf "${dir}/libpak-tools.tar.gz" -C $dir
389+
rm "${dir}/libpak-tools.tar.gz"
390+
391+
chmod +x "${dir}/libpak-tools"
392+
else
393+
util::print::info "Using libpak-tools"
394+
fi
395+
}
396+
339397
function util::tools::create-package::install () {
340398
local dir version
341399
version=""

scripts/build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ function main() {
117117
util::print::info "Setting default target platform architecture to: linux/amd64"
118118
fi
119119

120+
if [[ ${#targets[@]} -eq 0 ]]; then
121+
targets=("linux/amd64")
122+
util::print::info "Setting default target platform architecture to: linux/amd64"
123+
fi
124+
120125
run::build
121126
cmd::build
122127

0 commit comments

Comments
 (0)