From a98eda07a7a0a8fa8a1501088b8e2ec77d2097fe Mon Sep 17 00:00:00 2001
From: Pauline <git@ethanlibs.co>
Date: Tue, 23 Jul 2024 19:31:11 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20java=20info=20metadata?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crates/core/src/utils/java.rs           |   3 +++
 crates/core/wrapper/java/JavaInfo.class | Bin 1285 -> 989 bytes
 crates/core/wrapper/main/LICENSE        |   1 -
 3 files changed, 3 insertions(+), 1 deletion(-)
 delete mode 120000 crates/core/wrapper/main/LICENSE

diff --git a/crates/core/src/utils/java.rs b/crates/core/src/utils/java.rs
index 18f1ecf8..f27282ce 100644
--- a/crates/core/src/utils/java.rs
+++ b/crates/core/src/utils/java.rs
@@ -266,15 +266,18 @@ pub async fn check_java_instance(path: &Path) -> Option<JavaVersion> {
 	}
 
 	let file_path = tempdir.join("JavaInfo.class");
+	tracing::info!("checking java with {}", file_path.to_string_lossy().to_string());
 	io::write(&file_path, bytes).await.ok()?;
 
 	let output = Command::new(&java)
 		.arg("-cp")
 		.arg(file_path.parent().unwrap())
 		.arg("JavaInfo")
+		.env_remove("_JAVA_OPTIONS")
 		.output()
 		.ok()?;
 	let stdout = String::from_utf8_lossy(&output.stdout);
+	tracing::info!("{}", stdout);
 
 	let mut java_version = None;
 	let mut java_arch = None;
diff --git a/crates/core/wrapper/java/JavaInfo.class b/crates/core/wrapper/java/JavaInfo.class
index 9086f6cab3a0355af0e3fc8e432f1d800c9eeb25..69ffc97b4ae8997e1c56ec133f62c50fd8149f5a 100644
GIT binary patch
literal 989
zcma)5T~8BH5IxiGcDKtGuu!ldA_~|dw2FuV1rxCZkdKBXB*X`^lq)W_yUnsC^6oG3
zg=aAVqLIWGAN)o7pg6ZQCVV`Y?9RPAcV^C+Gk1Ud`FsLk1XBi@(H%t-ZW-vo?I@c&
z8hQ<==$58WN55R}8b~26V+J(b(=n)HNJB<LmJpww%}>9`KYvwNSuW&PR_F2-q2=Ym
zw!Ld-OSZd}wF2L9w<ZXYoZ~vd6d{~SuMw1KZ&MJO793YBRm&T~U$r+%>`}_L;}Y6Z
zS5%RSF)Of(Zx`)KEnY*MNfGp1u~e^bSYFjHiWx^%i_J5WIrp`fk(5ldpw+}RnRMU8
z0}PvZh!H~jMZ(XjPH9v4CLUpwK$9jO<B5hb6XTdLk;5dR`C<}5^L8?}UwlI_<zZ%5
z_&bir?dbD$9_P}QH?~DFIOnqVb^=i*G;E2W;CmI}2YZD6)MZK2mt8EbSLJ$%vm?jL
z7Fhj&XCUmdoPk}b2zQe(^k4PrB5<M}cxQtow5F~EZmEfJ9+CB^Nc<8Dkhls_-UIQ@
zVa7^oF1^MBY2r%>5IW?Lco*h9&x~z?zq)uOUe$pk(8pR}8{0_DNr<8y*XyANoT~Ae
z70w+Xv^aP&6&_U*O4kQG9ZV?0<7!epMtD4ujC@Dm0hBLL*N+fMs)x|xI-6vK%^{+P
zF!rG;x%Ud~pML8+MuP+nK?3(PB%t$`!N3jZMhv}Z#0+;a%f2OMzQW9t9MuEm6ed&+
z9VB1w<2S}Mbn^2H^ppQI9XI~9Isk=}fVlb<=6X0Dv(}Y(qxA`)i+zW<<1UU2;pSgS
C&C?$M

literal 1285
zcmaJ>O-~b16g{t<cG_VoSSU~s5G~juQbk3i1(gZ`1tFBw5EtfAo-okPG&2t(dw+y$
zHmt=&35hISxbxrWLh()uv9*oK%-lC`?z`ul`!U~spPT}iLPmoJUKNTCAN&k0+kB5F
z3*6jHF0F5iykzjF4bzZQ4BmJm7eoL-6`GDF=nR2p<UVh{u^7UcxtYxKnWwLpSC*D%
zR#xX{vJ9=S7XAjzO4~3uQyMOzSw)ME%LvyXX7?Q_iVRJgLN41@N!W6qVK81FBT>H<
zq_Ax|B4{V3)-Dl`RGbVexlF*4-~}(H!lb)XM-*KQ9Yww)GM1U=@}(iSXyr(5N{3;*
z0cbsD0~#8xphrcojy_za1eE31QeaR^E}?=+92?*ya&C&Q>9~#<gCgD<Bu0tPCvqwV
zYZF$^XaI2vX*na@&Tj=U#Gt#VBYVPj42wXNjI|*cnimXHyx1+S3wxEX7idQ*a)Z9N
z#~YL>kz)vDCC~3H@>1DfEmu69FP!&-mbG^6yqGoIP@#)X7;&+Q<+No<N7}r!DCCy4
z;WYa(rr`m`RXlXlKfw?yC#T$OhPh|$h-9TjDixXKd1=|y0Pm}FbnaLQI>*h8f^cFB
zmbJ56O4S#rYNzJl>V8QyaIa27rTtUYB|Z<4;e|rhkRla8ntF{*GRpY8X$m`2;Ep34
z6^|GO>clnTtl|kn@BdwC1S<k@ho;X%{manh&L6G3w5GwO=S_O+A<M}6hCYLRC_4_*
z)BWro3gQ+<$hxivbW|mq@urWUE)JhgdB>E9(sO|1a6}oM@I`&c2u=8-{;!A}p*8A@
z`cKdSd_wmjd`kMA!Vb^AcORqQ1@gcJ8YBpmIcn%6hJ6SjM!h_S7K}rq|4kdFX+)Fc
z)eq&2B=}U^X6{WCe<7h_fUcilKS)-91YbxSf<lLYu<r{7*1X{x*)=7c$bN+SuTJ`(
cVU#>QxQlya1Elyq-6>4cn?|cCJSG~^KMt`r8~^|S

diff --git a/crates/core/wrapper/main/LICENSE b/crates/core/wrapper/main/LICENSE
deleted file mode 120000
index f1ed04c7..00000000
--- a/crates/core/wrapper/main/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-./LICENSE
\ No newline at end of file