From 150e25c4f8123a4c9c63e8dca1b4737fa6c1135c Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 17 Jun 2019 10:32:11 +0100 Subject: Revert "Java 8 workaround" This reverts commit 3682a747bdf319a34fcce7cad9771a1a3ead34ec. --- stage5/00-install-extras/00-packages | 14 ++++++++++++++ stage5/00-install-extras/00-run.sh | 8 -------- stage5/00-install-extras/01-packages | 14 -------------- 3 files changed, 14 insertions(+), 22 deletions(-) create mode 100644 stage5/00-install-extras/00-packages delete mode 100755 stage5/00-install-extras/00-run.sh delete mode 100644 stage5/00-install-extras/01-packages (limited to 'stage5') diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages new file mode 100644 index 0000000..5eb164e --- /dev/null +++ b/stage5/00-install-extras/00-packages @@ -0,0 +1,14 @@ +mu-editor +sonic-pi +scratch nuscratch scratch2 +smartsim + +minecraft-pi python-minecraftpi +python-sense-emu sense-emu-tools python-sense-emu-doc + +claws-mail +greenfoot-unbundled bluej +nodered +realvnc-vnc-viewer + +python-games diff --git a/stage5/00-install-extras/00-run.sh b/stage5/00-install-extras/00-run.sh deleted file mode 100755 index f102311..0000000 --- a/stage5/00-install-extras/00-run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF -apt-get install openjdk-11-jre-headless -y --no-install-recommends -#update-binfmts --package openjdk-11 --remove jar /usr/bin/jexec -apt-get purge openjdk-11-jre-headless openjdk-8-jre-headless+ -y -apt-mark auto openjdk-8-jre-headless -EOF diff --git a/stage5/00-install-extras/01-packages b/stage5/00-install-extras/01-packages deleted file mode 100644 index 5eb164e..0000000 --- a/stage5/00-install-extras/01-packages +++ /dev/null @@ -1,14 +0,0 @@ -mu-editor -sonic-pi -scratch nuscratch scratch2 -smartsim - -minecraft-pi python-minecraftpi -python-sense-emu sense-emu-tools python-sense-emu-doc - -claws-mail -greenfoot-unbundled bluej -nodered -realvnc-vnc-viewer - -python-games -- cgit v1.2.3