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

Merge branch 'master' of github.com:jht5945/buildj

Browse Source
This commit is contained in:
Hatter Jiang
2019-08-16 00:42:13 +08:00
parent 28ff565f6e 096366eb89
commit 644a57f900
5 changed files with 143 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@@ -122,7 +122,9 @@ fn do_with_buildin_arg_builder(first_arg: &str, args: &Vec<String>, builder_name
true => get_env_with_java_home(&java_home),
false => get_env(),
};
new_env.insert(builder_desc.get_builder_home_name(), builder_desc.home.clone());
for builder_home_name in builder_desc.get_builder_home_name() {
new_env.insert(builder_home_name, builder_desc.home.clone());
}
let mut cmd = Command::new(builder_desc.get_builder_bin());
cmd.envs(&new_env);
@@ -307,7 +309,9 @@ fn main() {
print_message(MessageType::OK, &format!("BUILDER_HOME = {}", &builder_desc.home));
let mut new_env = get_env_with_java_home(&java_home);
new_env.insert(builder_desc.get_builder_home_name(), builder_desc.home.clone());
for builder_home_name in builder_desc.get_builder_home_name() {
new_env.insert(builder_home_name, builder_desc.home.clone());
}
process_envs(&mut new_env, &build_json_object);
let mut cmd = Command::new(builder_desc.get_builder_bin());