From b5f4e595cd0f7d5e6212b842173b2f5552b9e7fd Mon Sep 17 00:00:00 2001 From: Alex Jordan Date: Mon, 15 Aug 2016 18:35:40 -0700 Subject: [PATCH] Fix download script for Ubuntu 16.04 (#1826) Kept 14.04 for CI and because 14.04 is LTS --- tools/download.sh | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/tools/download.sh b/tools/download.sh index 7d0d1b766..d51e38aff 100755 --- a/tools/download.sh +++ b/tools/download.sh @@ -22,24 +22,35 @@ case "$OSTYPE" in case "$ID" in centos*) sudo yum install -y curl wget - info=$(get_info rpm) + version=rpm ;; ubuntu) sudo apt-get install -y curl wget - info=$(get_info deb) + case "$VERSION_ID" in + 14.04) + version=ubuntu.14.04-x64.deb + ;; + 16.04) + version=ubuntu.16.04-x64.deb + ;; + *) + exit 2 >&2 "Ubuntu $VERSION_ID is not supported!" + esac ;; *) exit 2 >&2 "$NAME is not supported!" esac ;; darwin*) - info=$(get_info pkg) + version=pkg ;; *) exit 2 >&2 "$OSTYPE is not supported!" ;; esac +info=$(get_info $version) + # Parses $info for asset ID and package name read asset package <<< $(echo $info | sed 's/[,"]//g' | awk '{ print $2; print $4 }') @@ -58,7 +69,15 @@ case "$OSTYPE" in sudo yum install "./$package" ;; ubuntu) - sudo apt-get install -y libunwind8 libicu52 + case "$VERSION_ID" in + 14.04) + $icupackage=libicu52 + ;; + 16.04) + $icupackage=libicu55 + ;; + esac + sudo apt-get install -y libunwind8 $icupackage sudo dpkg -i "./$package" ;; *)