From fb9d601558c86ec9dbd654fa7add0124a72dbc7d Mon Sep 17 00:00:00 2001 From: Elias Gabrielsson Date: Wed, 19 Dec 2018 22:13:14 +0100 Subject: [PATCH] Zulu repo (#491) * Remove unused Java installation code Signed-off-by: Elias Gabrielsson * Base Zulu Java installation on distrubition Resolves #368 Signed-off-by: Elias Gabrielsson --- functions/java-jre.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/functions/java-jre.sh b/functions/java-jre.sh index ec1cef23d..b3f663976 100644 --- a/functions/java-jre.sh +++ b/functions/java-jre.sh @@ -45,7 +45,11 @@ java_zulu_embedded_archive() { if is_arm; then arch="[arch=armhf]"; fi cond_redirect apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 219BD9C9 if [ $? -ne 0 ]; then echo "FAILED (keyserver)"; exit 1; fi - echo "deb $arch http://repos.azulsystems.com/debian stable main" > /etc/apt/sources.list.d/zulu-embedded.list + if is_ubuntu; then + echo "deb $arch http://repos.azulsystems.com/ubuntu stable main" > /etc/apt/sources.list.d/zulu-embedded.list + else + echo "deb $arch http://repos.azulsystems.com/debian stable main" > /etc/apt/sources.list.d/zulu-embedded.list + fi if is_pine64; then cond_redirect dpkg --add-architecture armhf; fi cond_redirect apt update if is_arm; then