From 63ca3b908129a35e546ffa24c8849e9acb912c34 Mon Sep 17 00:00:00 2001 From: Scott McLeod Date: Mon, 9 Sep 2019 15:44:40 -0400 Subject: [PATCH] Add jq to OSX --- .travis.yml | 12 +++++++----- bin/functions | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 929b0c6..254ead4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: c script: asdf plugin-test java $TRAVIS_BUILD_DIR before_script: - - git clone https://github.com/asdf-vm/asdf.git - - . asdf/asdf.sh -os: - - linux - - osx +- git clone https://github.com/asdf-vm/asdf.git +- . asdf/asdf.sh +matrix: + include: + - os: linux + - os: osx + install: HOMEBREW_NO_AUTO_UPDATE=1 brew install jq diff --git a/bin/functions b/bin/functions index dea12a4..5abe8c9 100755 --- a/bin/functions +++ b/bin/functions @@ -6,9 +6,12 @@ mkdir -p ${CACHE_DIR} case "$(uname -s)" in Darwin) TEMP_DIR=$(mktemp -dt asdf-java) STAT="stat -f %c ${CACHE_DIR}/*" + SHA256SUM="gsha256sum" ;; *) TEMP_DIR=$(mktemp -dp /tmp asdf-java.XXXXXXXX) - STAT="stat -c %Z ${CACHE_DIR}/*";; + STAT="stat -c %Z ${CACHE_DIR}/*" + SHA256SUM="sha256sum" + ;; esac trap "cd ${PWD}; rm -rf ${TEMP_DIR}" EXIT @@ -72,6 +75,13 @@ function os { esac } +function sha256_sum { + case `uname -s` in + Linux) sha256sum -c $(basename ${1}) ;; + Darwin) gsha256sum -c $(basename ${1}) ;; + esac +} + function architecture { case `uname -m` in x86_64) echo "x64" ;; @@ -99,7 +109,7 @@ function install { exit 1 fi - sha256sum -c $(basename ${checksum_link}) + sha256_sum ${checksum_link} tar zxf $(basename ${binary_link}) dir=$(set -- $(ls -d */) ; echo ${1})