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

match true/false -> if

Browse Source
This commit is contained in:
Hatter Jiang
2019-08-24 01:07:29 +08:00
parent ec06e6e5c4
commit 8425099e5f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/jdk.rs
View File

@@ -33,9 +33,10 @@ pub fn get_java_home(version: &str) -> Option<String> {
Some(j) => Some(j), Some(j) => Some(j),
None => match get_local_java_home(version) { None => match get_local_java_home(version) {
Some(j) => Some(j), Some(j) => Some(j),
None => match get_cloud_java(version) { None => if get_cloud_java(version) {
true => get_local_java_home(version), get_local_java_home(version)
false => None, } else {
None
}, },
}, },
} }

7
src/main.rs
View File

@@ -127,9 +127,10 @@ fn do_with_buildin_arg_builder(first_arg: &str, args: &Vec<String>, builder_name
} }
print_message(MessageType::OK, &format!("BUILDER_HOME = {}", &builder_desc.home)); print_message(MessageType::OK, &format!("BUILDER_HOME = {}", &builder_desc.home));
let mut new_env = match has_java { let mut new_env = if has_java {
true => get_env_with_java_home(&java_home), get_env_with_java_home(&java_home)
false => get_env(), } else {
get_env()
}; };
for builder_home_name in builder_desc.get_builder_home_name() { for builder_home_name in builder_desc.get_builder_home_name() {
new_env.insert(builder_home_name, builder_desc.home.clone()); new_env.insert(builder_home_name, builder_desc.home.clone());