From 0324ce8bbecc19d927779b58e5a599e20dc0573d Mon Sep 17 00:00:00 2001
From: DarkFeather <ircs://aninix.net:6697/DarkFeather>
Date: Tue, 17 May 2022 23:52:04 -0500
Subject: [PATCH] Correcting Java issues; improvements for `make clean`

---
 .gitignore         | 2 +-
 Makefile           | 9 +++------
 PKGBUILD           | 2 +-
 tests/test_unit.py | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3cc4991..ea5dbda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 HelloWorld
 HelloWorld.class
 HelloWorld.exe
-tests/__pycache__
+__pycache__
 *.tar.zst
 *.tar.zst.sig
 pkg/
diff --git a/Makefile b/Makefile
index 326d07d..c0511ba 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ test: compile
 	python3 -m pytest
 
 clean: 
-	cat .gitignore | xargs rm -Rf
+	for i in `cat .gitignore`; do /bin/bash -c "rm -Rf $$i"; done
 
 diff: 
 	@echo Nothing to do.
@@ -25,8 +25,8 @@ checkperm:
 c: HelloWorld.c /usr/bin/gcc
 	gcc -o HelloWorld HelloWorld.c
 
-java: HelloWorld.java /usr/lib/jvm/java-15-openjdk/bin/java /usr/lib/jvm/java-15-openjdk/bin/javac
-	/usr/lib/jvm/java-15-openjdk/bin/javac HelloWorld.java
+java: HelloWorld.java /usr/lib/jvm/java-18-openjdk/bin/javac /usr/lib/jvm/java-18-openjdk/bin/java
+	/usr/lib/jvm/java-18-openjdk/bin/javac HelloWorld.java
 
 bash: HelloWorld.bash /usr/bin/bash
 	#bash HelloWorld.bash
@@ -34,9 +34,6 @@ bash: HelloWorld.bash /usr/bin/bash
 php: HelloWorld.php /usr/bin/php
 	#php HelloWorld.php
 
-#hack: HelloWorld.php /usr/bin/hhvm
-	#hhvm --php HelloWorld.php
-
 perl: HelloWorld.pl /usr/bin/perl
 	#perl ./HelloWorld.pl
 
diff --git a/PKGBUILD b/PKGBUILD
index 1d106c3..c632b0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ arch=("x86_64")
 url="https://aninix.net/foundation/${pkgname}"
 license=('custom')
 groups=()
-depends=('bash>=4.4' 'php' 'perl' 'jre-openjdk>=15.0.1' 'python>=3.7')
+depends=('bash>=4.4' 'php' 'perl' 'jdk-openjdk>=18.0.1.1.u2-1' 'jre-openjdk-headless>=18.0.1.1.u2-1' 'python>=3.7')
 makedepends=('make>=4.2' 'mono>5.0.0' 'gcc' 'python-pytest')
 checkdepends=()
 optdepends=()
diff --git a/tests/test_unit.py b/tests/test_unit.py
index 66e27b1..3c425f8 100644
--- a/tests/test_unit.py
+++ b/tests/test_unit.py
@@ -21,7 +21,7 @@ def test_cs():
 
 def test_java():
     print(os.getcwd())
-    fh = os.popen("/usr/lib/jvm/java-15-openjdk/bin/java HelloWorld", mode='r', buffering=-1)
+    fh = os.popen("/usr/lib/jvm/java-18-openjdk/bin/java HelloWorld", mode='r', buffering=-1)
     output = fh.read()
     retcode = fh.close()
     assert retcode == None and CheckOutput(output)