hatter/buildj
1
0
Fork 0
mirror of https://github.com/jht5945/buildj.git synced 2025-12-27 17:20:06 +08:00
Code Issues Releases Wiki Activity

update jdk.rs

Browse Source
This commit is contained in:
Hatter Jiang
2019-08-04 23:04:28 +08:00
parent 4f772f3511
commit 965ab71688
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/jdk.rs
View File

@@ -70,18 +70,9 @@ pub fn get_macos_java_home(version: &str) -> Option<String> {
if ! is_macos() {
return None;
}
let output = match Command::new(MACOS_LIBEXEC_JAVAHOME).arg("-version").arg(version).output() {
Err(_) => return None,
Ok(o) => o,
};
match str::from_utf8(&output.stderr) {
Err(_) => (),
Ok(o) => {
// Unable to find any JVMs matching version "1.6".
if o.contains("Unable to find any JVMs") {
return None;
}
},
let output = Command::new(MACOS_LIBEXEC_JAVAHOME).arg("-version").arg(version).output().ok()?;
if str::from_utf8(&output.stderr).ok()?.contains("Unable to find any JVMs") {
return None;
};
Some(str::from_utf8(&output.stdout).ok()?.trim().to_string())
}