From 0fc67544b2df5f9f2fa0982e629ac8ef8293257b Mon Sep 17 00:00:00 2001 From: "Hatter Jiang@Pixelbook" Date: Fri, 23 Aug 2019 23:58:55 +0800 Subject: [PATCH] update if else --- src/http.rs | 4 +--- src/jdk.rs | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/http.rs b/src/http.rs index 64d10c2..94307db 100644 --- a/src/http.rs +++ b/src/http.rs @@ -11,9 +11,7 @@ use rust_util::{ XResult, }; -use super::misc::{ - VERBOSE, -}; +use super::misc::VERBOSE; pub fn download_url(url: &str, dest: &mut File) -> XResult<()> { if *VERBOSE { diff --git a/src/jdk.rs b/src/jdk.rs index d245115..b9d8919 100644 --- a/src/jdk.rs +++ b/src/jdk.rs @@ -75,9 +75,10 @@ pub fn get_macos_java_home(version: &str) -> Option { print_message(MessageType::DEBUG, &format!("java_home outputs: {}", output_in_utf8)); } if output_in_utf8.contains("Unable to find any JVMs") { - return None; + None + } else { + Some(str::from_utf8(&output.stdout).ok()?.trim().to_string()) } - Some(str::from_utf8(&output.stdout).ok()?.trim().to_string()) } pub fn get_local_java_home(version: &str) -> Option {