From 7a939ba96951d2a541f0fffd85562cda8f81835d Mon Sep 17 00:00:00 2001
From: Daniel Cerna <cernadaniel32@gmail.com>
Date: Fri, 16 Jun 2023 13:20:08 -0400
Subject: [PATCH] Adds default-jdk to java

---
 .../base/04-shared-libs/dependencies.txt      | 25 ++-----------------
 .../debuggers/visualvm/visualvm.sh            | 24 ++++++++++++++----
 software-modules/langs/java/javac/java.sh     |  2 +-
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/software-modules/base/04-shared-libs/dependencies.txt b/software-modules/base/04-shared-libs/dependencies.txt
index ca1cc71c..83af09e5 100644
--- a/software-modules/base/04-shared-libs/dependencies.txt
+++ b/software-modules/base/04-shared-libs/dependencies.txt
@@ -1,26 +1,14 @@
 antlr3
-aspnetcore-runtime-6.0
-aspnetcore-targeting-pack-6.0
 binutils
 binutils-common
 binutils-x86-64-linux-gnu
-ca-certificates-java
 chromium-common
 codeblocks-common
-default-jre
-default-jre-headless
-dotnet-apphost-pack-6.0
-dotnet-host
-dotnet-hostfxr-6.0
-dotnet-runtime-6.0
-dotnet-runtime-deps-6.0
-dotnet-targeting-pack-6.0
 emacs-bin-common
+emacs-common
 emacs-el
 emacs-gtk
-g++-12
 gawk
-gcc-12
 geany-common
 gedit-common
 gettext-base
@@ -33,7 +21,6 @@ gir1.2-soup-3.0
 git
 git-man
 install-info
-java-common
 javahelp2
 junit4
 kate5-data
@@ -59,7 +46,6 @@ libbsh-java
 libc-dev-bin
 libc6-dbg
 libc6-dev
-libcc1-0
 libclang1-14
 libcodeblocks0
 libcommons-codec-java
@@ -175,7 +161,6 @@ libserf-1-1
 libsigsegv2
 libsource-highlight-common
 libsource-highlight4v5
-libstdc++-12-dev
 libstringtemplate4-java
 libsvn1
 libswing-layout-java
@@ -193,7 +178,6 @@ libutf8proc2
 libvisualvm-jni
 libvterm0
 libwxbase3.2-1
-libwxgtk3.2-1
 libxcb-composite0
 libxcb-damage0
 libxm4
@@ -204,10 +188,6 @@ lua-luv
 m17n-db
 mc-data
 neovim-runtime
-netstandard-targeting-pack-2.1
-openjdk-17-jdk-headless
-openjdk-17-jre
-openjdk-17-jre-headless
 plasma-framework
 pypy3-lib
 python3-bs4
@@ -218,7 +198,6 @@ python3-charset-normalizer
 python3-click
 python3-colorama
 python3-dbus
-python3-gi-cairo
 python3-gtts
 python3-gtts-token
 python3-idna
@@ -237,7 +216,7 @@ qml-module-qtquick-layouts
 qml-module-qtquick-xmllistmodel
 qml-module-qtwebkit
 rake
-rpcsvc-proto
+ruby
 ruby-net-telnet
 ruby-rubygems
 ruby-sdbm
diff --git a/software-modules/debuggers/visualvm/visualvm.sh b/software-modules/debuggers/visualvm/visualvm.sh
index 690f6e55..df70428c 100644
--- a/software-modules/debuggers/visualvm/visualvm.sh
+++ b/software-modules/debuggers/visualvm/visualvm.sh
@@ -17,17 +17,31 @@
 set -xe
 NAME=visualvm
 TARGET_DIR="/run/initramfs/memory/system/huronOS/software/debuggers/"
+MAIN_PATH="$(dirname "$(readlink -f "$0")")"
 
-## In this particular script, given that visualvm depends on java but java cannot be installed directly in the dependencies,
-## it is required to create a temp layer installing the remaining dependencies related to java before actually installing visualvm.
+apt update
+
+## Patch visualvm so it is not linked to the javasdk
+## allowing only the relevant visualvm files to be preserved
+cd /tmp
+apt download visualvm
+mkdir tmp-visualvm
+dpkg-deb -R visualvm_2.1.5-1_all.deb tmp-visualvm
+sed -i 's/default-jdk (>= 2:1.11) | java11-sdk, //' tmp-visualvm/DEBIAN/control
+dpkg-deb -b tmp-visualvm visualvm-patched.deb
+
+## Install java so it doesn't autoinstall
+apt install  --yes --no-install-recommends openjdk-17-jdk default-jdk
 
 ## Install software
-apt update
 apt install --yes --no-install-recommends $NAME
-apt autoremove --yes
+
+## Remove java and it's dependencies
+## effectively keeping visualvm and its files
+apt remove  --yes --autoremove openjdk-17-jdk default-jdk
 
 ## Prepare final files
-cp ./$NAME.desktop /usr/share/applications/
+cp "$MAIN_PATH/$NAME.desktop" /usr/share/applications/
 
 ## Create packed changes
 savechanges /tmp/$NAME.hsm
diff --git a/software-modules/langs/java/javac/java.sh b/software-modules/langs/java/javac/java.sh
index 68b8b007..129c7f26 100755
--- a/software-modules/langs/java/javac/java.sh
+++ b/software-modules/langs/java/javac/java.sh
@@ -22,7 +22,7 @@ TARGET_DIR="/run/initramfs/memory/system/huronOS/software/langs/"
 
 ## Install software
 apt update
-apt install --yes --no-install-recommends openjdk-17-jdk
+apt install --yes --no-install-recommends openjdk-17-jdk default-jdk
 apt autoremove --yes
 
 ## Prepare final files