hatter/buildj
1
0
Fork 0
mirror of https://github.com/jht5945/buildj.git synced 2025-12-30 02:40:03 +08:00
Code Issues Releases Wiki Activity

use const

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

4
src/jdk.rs
View File

@@ -23,6 +23,8 @@ const OPENJDK_MACOS: &str = "openjdk-osx";
const JDK_LINUX: &str = "jdk-linux"; const JDK_LINUX: &str = "jdk-linux";
const OPENJDK_LINUX: &str = "openjdk-linux"; const OPENJDK_LINUX: &str = "openjdk-linux";
const MACOS_LIBEXEC_JAVAHOME: &str = "/usr/libexec/java_home";
pub const LOCAL_JAVA_HOME_BASE_DIR: &str = ".jssp/jdks"; pub const LOCAL_JAVA_HOME_BASE_DIR: &str = ".jssp/jdks";
pub fn get_java_home(version: &str) -> Option<String> { pub fn get_java_home(version: &str) -> Option<String> {
@@ -68,7 +70,7 @@ pub fn get_macos_java_home(version: &str) -> Option<String> {
if ! is_macos() { if ! is_macos() {
return None; return None;
} }
let output = match Command::new("/usr/libexec/java_home").arg("-version").arg(version).output() { let output = match Command::new(MACOS_LIBEXEC_JAVAHOME).arg("-version").arg(version).output() {
Err(_) => return None, Err(_) => return None,
Ok(o) => o, Ok(o) => o,
}; };