Add jq to OSX

This commit is contained in:
Scott McLeod 2019-09-09 15:44:40 -04:00
parent 96c279055b
commit 1b55f57103
No known key found for this signature in database
GPG Key ID: 9C5566AB07C8E593
2 changed files with 19 additions and 7 deletions

View File

@ -1,8 +1,10 @@
language: c language: c
script: asdf plugin-test java $TRAVIS_BUILD_DIR script: asdf plugin-test java $TRAVIS_BUILD_DIR
before_script: before_script:
- git clone https://github.com/asdf-vm/asdf.git - git clone https://github.com/asdf-vm/asdf.git
- . asdf/asdf.sh - . asdf/asdf.sh
os: matrix:
- linux include:
- osx - os: linux
- os: osx
install: HOMEBREW_NO_AUTO_UPDATE=1 brew install jq

View File

@ -6,9 +6,12 @@ mkdir -p ${CACHE_DIR}
case "$(uname -s)" in case "$(uname -s)" in
Darwin) TEMP_DIR=$(mktemp -dt asdf-java) Darwin) TEMP_DIR=$(mktemp -dt asdf-java)
STAT="stat -f %c ${CACHE_DIR}/*" STAT="stat -f %c ${CACHE_DIR}/*"
SHA256SUM="gsha256sum"
;; ;;
*) TEMP_DIR=$(mktemp -dp /tmp asdf-java.XXXXXXXX) *) TEMP_DIR=$(mktemp -dp /tmp asdf-java.XXXXXXXX)
STAT="stat -c %Z ${CACHE_DIR}/*";; STAT="stat -c %Z ${CACHE_DIR}/*"
SHA256SUM="sha256sum"
;;
esac esac
trap "cd ${PWD}; rm -rf ${TEMP_DIR}" EXIT trap "cd ${PWD}; rm -rf ${TEMP_DIR}" EXIT
@ -72,6 +75,13 @@ function os {
esac esac
} }
function sha256_sum {
case `uname -s` in
Linux) sha256sum -c $(basename ${1}) ;;
Darwin) gsha256sum -c $(basename ${1}) ;;
esac
}
function architecture { function architecture {
case `uname -m` in case `uname -m` in
x86_64) echo "x64" ;; x86_64) echo "x64" ;;
@ -99,7 +109,7 @@ function install {
exit 1 exit 1
fi fi
sha256sum -c $(basename ${checksum_link}) sha256_sum ${checksum_link}
tar zxf $(basename ${binary_link}) tar zxf $(basename ${binary_link})
dir=$(set -- $(ls -d */) ; echo ${1}) dir=$(set -- $(ls -d */) ; echo ${1})