From 2539e817f39a6660f17b87d967159661d4c68062 Mon Sep 17 00:00:00 2001 From: Ricardo Rosales Date: Wed, 30 Jan 2019 23:54:21 -0800 Subject: [PATCH] check if native version is available first then try to download it --- bin/install | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/bin/install b/bin/install index 88206c0..c83a814 100755 --- a/bin/install +++ b/bin/install @@ -7,26 +7,29 @@ install () { local platform="" local tempdir="" local native_filename="" + local github_prefix="https://github.com/JetBrains/kotlin/releases" [ "Linux" = "$(uname)" ] && platform="linux" || platform="darwin" [ "linux" = "${platform}" ] && tempdir=$(mktemp -d asdf-kotlin.XXXX) || tempdir=$(mktemp -dt asdf-kotlin) - curl -L "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip" -o "${tempdir}/kotlin-compiler.zip" + curl -L "${github_prefix}/download/v${version}/kotlin-compiler-${version}.zip" -o "${tempdir}/kotlin-compiler.zip" unzip -qq "${tempdir}/kotlin-compiler.zip" -d "${install_path}" - if [[ $platform == "linux-gnu" ]]; then - native_filename="kotlin-native-linux-${version}.tar.gz" + if [[ $platform == "linux" ]]; then + native_filename="kotlin-native-linux-\d\.\d\.\d.tar.gz" elif [[ $platform == "darwin" ]]; then - native_filename="kotlin-native-macos-${version}.tar.gz" + native_filename="kotlin-native-macos-\d\.\d\.\d.tar.gz" fi - if [[ ! -z $native_filename ]]; then - local native_url="https://github.com/JetBrains/kotlin/releases/download/v${version}/${native_filename}" + local check_url="${github_prefix}/tag/v${version}" + local check_regex="/JetBrains/kotlin/releases/download/v${version}/${native_filename}" + local check_native=$(curl "${check_url}" | grep -P "${check_regex}" | cut -f2 -d '"') + if [[ ! -z $check_native ]]; then local native_install_path="${install_path}/kotlin-native" - curl -fL "${native_url}" -o "${tempdir}/kotlin-native.tar.gz" && \ + curl -fL "https://github.com${check_native}" -o "${tempdir}/kotlin-native.tar.gz" && \ mkdir -p "${native_install_path}" && \ - (cd "${native_install_path}" && tar -xf "${tempdir}/kotlin-native.tar.gz" --strip-components=1) + tar -xf "${tempdir}/kotlin-native.tar.gz" --strip-components=1 --directory "${native_install_path}" fi rm -rf "${tempdir}"