From 60001fe040c86e2beb8b4f9c371810415d895fd2 Mon Sep 17 00:00:00 2001 From: Korenevskiy Denis Date: Tue, 8 Oct 2024 11:19:01 +0300 Subject: [PATCH] download x64 for older versions of blast on mac os x --- package.json | 4 ++-- scripts/2.x/pkg-download.sh | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c633ab2..eb6a6c2 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,9 @@ "description": "Blast software package for Platforma Backend", "scripts": { "build": "true", - "pkg:build": "rm -rf dld && ./scripts/build.sh 2.10.0 && ./scripts/build.sh 2.11.0 && ./scripts/build.sh 2.12.0 && ./scripts/build.sh 2.13.0 && ./scripts/build.sh 2.14.0 && ./scripts/build.sh 2.14.1 && ./scripts/build.sh 2.15.0 && ./scripts/build.sh 2.16.0", + "pkg:build": "rm -rf dld && ./scripts/build.sh 2.10.0 && ./scripts/build.sh 2.11.0 && ./scripts/build.sh 2.12.0 && ./scripts/build.sh 2.13.0 && ./scripts/build.sh 2.14.0 && ./scripts/build.sh 2.14.1 && ./scripts/build.sh 2.15.0", - "publish:packages": "./scripts/publish.sh 2.10.0 && ./scripts/publish.sh 2.11.0 && ./scripts/publish.sh 2.12.0 && ./scripts/publish.sh 2.13.0 && ./scripts/publish.sh 2.14.0 && ./scripts/publish.sh 2.14.1 && ./scripts/publish.sh 2.15.0 && ./scripts/publish.sh 2.16.0", + "publish:packages": "./scripts/publish.sh 2.10.0 && ./scripts/publish.sh 2.11.0 && ./scripts/publish.sh 2.12.0 && ./scripts/publish.sh 2.13.0 && ./scripts/publish.sh 2.14.0 && ./scripts/publish.sh 2.14.1 && ./scripts/publish.sh 2.15.0", "publish:descriptors": "pl-pkg publish descriptors", "release": "npm run pkg:build && npm run publish:packages && npm run publish:descriptors" }, diff --git a/scripts/2.x/pkg-download.sh b/scripts/2.x/pkg-download.sh index 894a926..1b5d226 100755 --- a/scripts/2.x/pkg-download.sh +++ b/scripts/2.x/pkg-download.sh @@ -50,11 +50,17 @@ function download() { local _suffix="" local _os="${os}" + local _arch="${arch}" + if [ "${os}" == "windows" ]; then _os="win64" fi + if [ "${os}" == "macosx" ]; then + # for older versions of blast, download x64 instead of aarch64 (no aarch64 was built before 2.16.0) + _arch="x64" + fi - local _url="${base_url}/${version}/ncbi-blast-${version}+-${arch}-${_os}.${_ext}" + local _url="${base_url}/${version}/ncbi-blast-${version}+-${_arch}-${_os}.${_ext}" local _show_progress=("--show-progress") if [ "${CI:-}" = "true" ]; then