hatter/buildj
1
0
Fork 0
mirror of https://github.com/jht5945/buildj.git synced 2025-12-27 17:20:06 +08:00
Code Issues Releases Wiki Activity

update main.rs

Browse Source
This commit is contained in:
Hatter Jiang
2019-08-10 23:50:45 +08:00
parent 4ee71c9104
commit 09288d8a21
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.rs
View File

@@ -63,14 +63,14 @@ fn do_with_buildin_arg_java(first_arg: &str, args: &Vec<String>) {
}
fn do_with_buildin_arg_maven(first_arg: &str, args: &Vec<String>) {
do_with_buildin_arg_builder(first_arg, args, "maven", "MAVEN_HOME", "mvn")
do_with_buildin_arg_builder(first_arg, args, "maven")
}
fn do_with_buildin_arg_gradle(first_arg: &str, args: &Vec<String>) {
do_with_buildin_arg_builder(first_arg, args, "gradle", "GRADLE_HOME", "gradle")
do_with_buildin_arg_builder(first_arg, args, "gradle")
}
fn do_with_buildin_arg_builder(first_arg: &str, args: &Vec<String>, builder_name: &str, builder_home: &str, builder_bin: &str) {
fn do_with_buildin_arg_builder(first_arg: &str, args: &Vec<String>, builder_name: &str) {
let builder_version = &first_arg[(builder_name.len() + 3)..];
if builder_version == "" {
print_message(MessageType::ERROR, &format!("Builder version is not assigned!"));
@@ -107,9 +107,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_home.to_string(), builder_desc.home.clone());
new_env.insert(builder_desc.get_builder_home_name(), builder_desc.home.clone());
let mut cmd = Command::new(format!("{}/bin/{}", builder_desc.home.clone(), builder_bin));
let mut cmd = Command::new(builder_desc.get_builder_bin());
cmd.envs(&new_env);
let from_index = match has_java { true => 3, false => 2 };
for i in from_index..args.len() {