Merge pull request AdoptOpenJDK#116 from dinogun/dirname_fix

Handle both JRE and JDK dir structures gracefully to generate the JRE path.
lordrex34 · Mar 6, 2019 · 83650e2 · 83650e2
2 parents ce1c912 + 776c1c8
commit 83650e2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/build_latest.sh b/build_latest.sh
@@ -107,7 +107,6 @@ for vm in ${all_jvms}
 do
 	for package in ${all_packages}
 	do
-		oses=$(parse_os_entry ${vm})
 		for os in ${oses}
 		do
 			# Build = Release or Nightly

diff --git a/dockerfile_functions.sh b/dockerfile_functions.sh
@@ -177,7 +177,7 @@ EOI
     cd /opt/java/openjdk; \
     echo "${ESUM}  /tmp/openjdk.tar.gz" | sha256sum -c -; \
     tar -xf /tmp/openjdk.tar.gz; \
-    jdir=$(dirname $(dirname $(find /opt/java/openjdk -name java))); \
+    jdir=$(dirname $(dirname $(find /opt/java/openjdk -name java | grep -v "/jre/bin"))); \
     mv ${jdir}/* /opt/java/openjdk; \
 EOI
 }