From 27d1b74e6448f1a3a455e94b7f7dd307f86a0c48 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sun, 15 Sep 2019 22:14:36 +0000
Subject: Hack for JavaSE instead of OpenJDK

---
 .gitignore |  1 +
 Dockerfile | 15 +++++++++------
 README.md  | 14 +++++++-------
 startup.sh |  1 -
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 51d4dee..a2f49c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+jre-8u221-linux-x64.tar.gz
 waterfox-*.tar.bz2
diff --git a/Dockerfile b/Dockerfile
index e126c4c..75a4079 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,6 @@ RUN apt-get --yes update && apt-get --yes install --no-install-recommends \
     bzip2 \
     fonts-droid-fallback \
     fonts-noto \
-    icedtea-8-plugin \
     libdbus-glib-1-2 \
     libgtk-3-0 \
     ratpoison \
@@ -15,14 +14,18 @@ RUN apt-get --yes update && apt-get --yes install --no-install-recommends \
     x11-xserver-utils \
     xterm
 
-COPY startup.sh ratpoisonrc waterfox*.tar.bz2 /
+COPY startup.sh ratpoisonrc waterfox*.tar.bz2 jre-*.tar.gz /
 
 RUN set -x; \
     tar -C /usr/local -xf /waterfox*.tar.bz2 && \
-    rm -f /waterfox*.tar.bz2 && \
-    ln -s /usr/local/waterfox/waterfox /usr/local/bin
-
-COPY menu /root/.icewm/
+    rm -f                 /waterfox*.tar.bz2 && \
+    ln -s /usr/local/waterfox/waterfox /usr/local/bin && \
+    mkdir -p /usr/local/java && \
+    tar -C /usr/local/java -xf /jre-*.tar.gz && \
+    echo >>/etc/profile JRE_HOME=`echo /usr/local/java/jre*` && \
+    echo >>/etc/profile 'PATH="$PATH:$JRE_HOME/bin"' && \
+    update-alternatives --install /usr/bin/java java /usr/local/java/jre*/bin/java 1 && \
+    update-alternatives --set java /usr/bin/java java /usr/local/java/jre*/bin/java
 
 CMD ["/startup.sh"]
 
diff --git a/README.md b/README.md
index 5367aee..94b5769 100644
--- a/README.md
+++ b/README.md
@@ -16,12 +16,12 @@ Something along the lines of the `run.sh` formulation might work well
 as the command portion of a tunneling `ssh -L 5900:127.0.0.1:5900` command.
 
 This version is based on Ubuntu rather than Debian, because I was
-trying to get the icedtea-web Java Plugin stuff to work.  Still fails,
-too many things know that no browser supports this crap anymore.
+trying to get the icedtea-web Java Plugin stuff to work.  Didn't work,
+but then I tried a recipe for getting Java SE instead of OpenJDK, and
+that does seem to work.  Might work equally well on Debian.
 
-In theory, we might be able to get somewhere by building icedtea
-ourselves, or using an old packaged version.  See:
-
-* <https://github.com/AdoptOpenJDK/icedtea-web>
-* <https://packages.debian.org/source/stretch/icedtea-web>
+Sadly, this approach requires one to download JRE directly from
+Oracle, get an account, and check through a license agreement, so I
+can't just give it away, you'll have to download the JRE yourself.
 
+[Kate's reference on installing Java](https://www.wikihow.com/Install-Oracle-Java-on-Ubuntu-Linux)
diff --git a/startup.sh b/startup.sh
index e888715..cfb2393 100755
--- a/startup.sh
+++ b/startup.sh
@@ -6,7 +6,6 @@ mkdir -p $HOME/.vnc
 echo '' | vncpasswd -f >$HOME/.vnc/passwd
 chmod -R go= $HOME/.vnc
 
-# -localhost
 vncserver $DISPLAY -geometry 1280x768 -depth 16 -nolisten tcp
 ratpoison -f /ratpoisonrc
 vncserver -kill $DISPLAY
-- 
cgit v1.2.3