diff --git a/.gitignore b/.gitignore index 10a053b..3cc4991 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ HelloWorld HelloWorld.class HelloWorld.exe tests/__pycache__ -*.tar.xz +*.tar.zst +*.tar.zst.sig pkg/ src/ diff --git a/Makefile b/Makefile index 6b946e3..326d07d 100644 --- a/Makefile +++ b/Makefile @@ -25,8 +25,8 @@ checkperm: c: HelloWorld.c /usr/bin/gcc gcc -o HelloWorld HelloWorld.c -java: HelloWorld.java /usr/bin/java /usr/bin/javac - javac HelloWorld.java +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 bash: HelloWorld.bash /usr/bin/bash #bash HelloWorld.bash diff --git a/PKGBUILD b/PKGBUILD index e2ea33f..1d106c3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,4 @@ -pkgname="$(git config remote.origin.url | rev | cut -f 1 -d '/' | rev | sed 's/.git$//' | tr '[[:upper:]]' '[[:lower:]]')" +pkgname="$(git config remote.origin.url | rev | cut -f 1 -d '/' | rev | sed 's/.git$//')" pkgver="$(git describe --tag --abbrev=0)"."$(git rev-parse --short HEAD)" pkgrel=1 pkgrel() { @@ -10,8 +10,8 @@ arch=("x86_64") url="https://aninix.net/foundation/${pkgname}" license=('custom') groups=() -depends=('bash>=4.4' 'php' 'perl' 'java-environment' 'python>=3.7') -makedepends=('make>=4.2' 'mono>5.0.0' 'gcc') +depends=('bash>=4.4' 'php' 'perl' 'jre-openjdk>=15.0.1' 'python>=3.7') +makedepends=('make>=4.2' 'mono>5.0.0' 'gcc' 'python-pytest') checkdepends=() optdepends=() provides=("${pkgname}") diff --git a/tests/test_unit.py b/tests/test_unit.py index a2dfe6b..66e27b1 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("java HelloWorld", mode='r', buffering=-1) + fh = os.popen("/usr/lib/jvm/java-15-openjdk/bin/java HelloWorld", mode='r', buffering=-1) output = fh.read() retcode = fh.close() assert retcode == None and CheckOutput(output)