From 00ef6749f2ce87dcd3b9043d2b974bdb8b3698db Mon Sep 17 00:00:00 2001 From: "Hatter Jiang@Pixelbook" Date: Sun, 11 Aug 2019 00:00:26 +0800 Subject: [PATCH] use consts --- src/jdk.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/jdk.rs b/src/jdk.rs index a0ea754..e2bbfb2 100644 --- a/src/jdk.rs +++ b/src/jdk.rs @@ -24,6 +24,9 @@ use super::{ misc::*, }; +const PATH: &str = "PATH"; +const JAVA_HOME: &str = "JAVA_HOME"; + const OPENJDK_MACOS: &str = "openjdk-osx"; const JDK_LINUX: &str = "jdk-linux"; const OPENJDK_LINUX: &str = "openjdk-linux"; @@ -149,16 +152,16 @@ pub fn get_env_with_java_home(java_home: &str) -> HashMap { let mut new_env: HashMap = HashMap::new(); for (key, value) in env::vars() { let key_str = key.as_str(); - if "JAVA_HOME" == key_str { + if JAVA_HOME == key_str { // IGNORE JAVA_HOME - } else if "PATH" == key_str { + } else if PATH == key_str { let path = value.to_string(); let new_path = format!("{}/bin:{}", java_home, path); - new_env.insert("PATH".to_string(), new_path); + new_env.insert(PATH.to_string(), new_path); } else { new_env.insert(key, value); } } - new_env.insert("JAVA_HOME".to_string(), java_home.to_string()); + new_env.insert(JAVA_HOME.to_string(), java_home.to_string()); new_env }