mirror of
https://github.com/jht5945/buildj.git
synced 2025-12-28 09:40:04 +08:00
match true/false -> if
This commit is contained in:
@@ -33,9 +33,10 @@ pub fn get_java_home(version: &str) -> Option<String> {
|
||||
Some(j) => Some(j),
|
||||
None => match get_local_java_home(version) {
|
||||
Some(j) => Some(j),
|
||||
None => match get_cloud_java(version) {
|
||||
true => get_local_java_home(version),
|
||||
false => None,
|
||||
None => if get_cloud_java(version) {
|
||||
get_local_java_home(version)
|
||||
} else {
|
||||
None
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
|
||||
let mut new_env = match has_java {
|
||||
true => get_env_with_java_home(&java_home),
|
||||
false => get_env(),
|
||||
let mut new_env = if has_java {
|
||||
get_env_with_java_home(&java_home)
|
||||
} else {
|
||||
get_env()
|
||||
};
|
||||
for builder_home_name in builder_desc.get_builder_home_name() {
|
||||
new_env.insert(builder_home_name, builder_desc.home.clone());
|
||||
|
||||
Reference in New Issue
Block a user