Skip to content

Commit e818607

Browse files
committed
Update JRE requires generator
1 parent 6a878c7 commit e818607

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/main/java/org/fedoraproject/xmvn/generator/jpscript/JPackageScriptGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void generate(Collector collector) {
2828
if (content.contains("\n. /usr/share/java-utils/java-functions\n")) {
2929
collector.addRequires(filePath, "javapackages-tools");
3030
}
31-
if (content.contains("\nexport JAVA_HOME=\"/usr/lib/jvm/jre-21-openjdk\"\n")) {
31+
if (content.contains("\nexport JAVA_HOME=\"${JAVA_HOME:-/usr/lib/jvm/jre-21-openjdk}\"\n")) {
3232
collector.addRequires(filePath, "java-21-openjdk-headless");
3333
}
3434
}

src/test/resources/usr/bin/jflex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# JPackage Project <http://www.jpackage.org/>
55

66
# Set default JAVA_HOME
7-
export JAVA_HOME="/usr/lib/jvm/jre-21-openjdk"
7+
export JAVA_HOME="${JAVA_HOME:-/usr/lib/jvm/jre-21-openjdk}"
88

99
# Source functions library
1010
. /usr/share/java-utils/java-functions

0 commit comments

Comments
 (0)