From cb6dc126e46fe83095cd846e89b1f263e2785c8c Mon Sep 17 00:00:00 2001 From: Christopher Latham Date: Mon, 27 May 2019 23:55:26 -0400 Subject: [PATCH] setup-ubuntu.sh: Download 19.04 java package when running Ubuntu 19.04 --- scripts/setup-ubuntu.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 6f9ce9a0b..e0f567f7c 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -52,13 +52,20 @@ sudo apt-get -yq update sudo DEBIAN_FRONTEND=noninteractive \ apt-get install -yq --no-install-recommends $PACKAGES +# Find and assign UBUNTU_VERSION +if [[ `lsb_release -rs` == "19.04" ]]; then + UBUNTU_VERSION="19.04.2" +else + UBUNTU_VERSION="18.10.1" +fi + # Make openjdk 8 available: -curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk-headless_8u212-b03-0ubuntu1.18.10.1_amd64.deb -curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u212-b03-0ubuntu1.18.10.1_amd64.deb -curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u212-b03-0ubuntu1.18.10.1_amd64.deb -curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u212-b03-0ubuntu1.18.10.1_amd64.deb -sudo dpkg -i openjdk-8-jre-headless_8u212-b03-0ubuntu1.18.10.1_amd64.deb openjdk-8-jre_8u212-b03-0ubuntu1.18.10.1_amd64.deb openjdk-8-jdk_8u212-b03-0ubuntu1.18.10.1_amd64.deb openjdk-8-jdk-headless_8u212-b03-0ubuntu1.18.10.1_amd64.deb || sudo apt install -f -y -rm openjdk-8-jre-headless_8u212-b03-0ubuntu1.18.10.1_amd64.deb openjdk-8-jre_8u212-b03-0ubuntu1.18.10.1_amd64.deb openjdk-8-jdk_8u212-b03-0ubuntu1.18.10.1_amd64.deb openjdk-8-jdk-headless_8u212-b03-0ubuntu1.18.10.1_amd64.deb +curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk-headless_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb +curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb +curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb +curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb +sudo dpkg -i openjdk-8-jre-headless_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb openjdk-8-jre_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb openjdk-8-jdk_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb openjdk-8-jdk-headless_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb || sudo apt install -f -y +rm openjdk-8-jre-headless_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb openjdk-8-jre_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb openjdk-8-jdk_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb openjdk-8-jdk-headless_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb sudo mkdir -p /data/data/com.termux/files/usr sudo chown -R $(whoami) /data