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

update main.rs

Browse Source
This commit is contained in:
Hatter Jiang
2019-08-10 16:13:42 +08:00
parent e759ded2d0
commit ba13d7490e
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

@@ -255,11 +255,6 @@ fn main() {
Ok(object) => object, Ok(object) => object,
}; };
let envs_j = &build_json_object["envs"];
// envs: [
// ["A", "a"]
//]
let (java_home, builder_desc) = match get_java_and_builder(&build_json_object) { let (java_home, builder_desc) = match get_java_and_builder(&build_json_object) {
None => return, None => return,
Some((java_home, builder_desc)) => (java_home, builder_desc), Some((java_home, builder_desc)) => (java_home, builder_desc),
@@ -272,6 +267,11 @@ fn main() {
let builder_home_env = match builder_desc.name { BuilderName::Maven => "MAVEN_HOME", BuilderName::Gradle => "GRADLE_HOME", }; let builder_home_env = match builder_desc.name { BuilderName::Maven => "MAVEN_HOME", BuilderName::Gradle => "GRADLE_HOME", };
new_env.insert(builder_home_env.to_string(), builder_desc.home.clone()); new_env.insert(builder_home_env.to_string(), builder_desc.home.clone());
let envs_j = &build_json_object["envs"];
// envs: [
// ["A", "a"]
//]
if ! envs_j.is_null() { if ! envs_j.is_null() {
for env in envs_j.members() { for env in envs_j.members() {
if *VERBOSE { if *VERBOSE {