From c7eead9c45b8b165bcf1a7df7f02a4786918c43a Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Sun, 9 Oct 2022 19:30:42 +0200 Subject: openjdk-runtime: Fix shebangs, pass -L to cURL. Change-Id: I021e9e7c4996f0fbd27d4f62ab50d970bb987ecc --- openjdk-runtime/build | 2 +- openjdk-runtime/prepare | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openjdk-runtime/build b/openjdk-runtime/build index 0719996..79a9d7f 100755 --- a/openjdk-runtime/build +++ b/openjdk-runtime/build @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash # SPDX-FileCopyrightText: © 2022 Matthias Andreas Benkard # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/openjdk-runtime/prepare b/openjdk-runtime/prepare index f0fddba..8a348f4 100755 --- a/openjdk-runtime/prepare +++ b/openjdk-runtime/prepare @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash # SPDX-FileCopyrightText: © 2022 Matthias Andreas Benkard # # SPDX-License-Identifier: GPL-3.0-or-later @@ -7,10 +7,10 @@ set -euo pipefail cd "$(dirname $(readlink -e "$0"))" -openjdk_package_info=$(curl "https://api.foojay.io/disco/v2.0/packages?package_type=jdk&latest=per_distro&directly_downloadable=true&release_status=ga&javafx_bundled=false&operating_system=linux&architecture=x64&archive_type=tar.gz&distro=oracle_open_jdk") +openjdk_package_info=$(curl -L "https://api.foojay.io/disco/v2.0/packages?package_type=jdk&latest=per_distro&directly_downloadable=true&release_status=ga&javafx_bundled=false&operating_system=linux&architecture=x64&archive_type=tar.gz&distro=oracle_open_jdk") openjdk_package_uri=$(jq -r '.result[0].links.pkg_download_redirect' <<<"${openjdk_package_info}") openjdk_package_filename=$(jq -r '.result[0].filename' <<<"${openjdk_package_info}") -curl --fail --create-dirs -C - -o "jdk-dist/${openjdk_package_filename}" "${openjdk_package_uri}" +curl --fail --create-dirs -L -C - -o "jdk-dist/${openjdk_package_filename}" "${openjdk_package_uri}" ln -svf "${openjdk_package_filename}" "jdk-dist/latest.tar.gz" -- cgit v1.2.3