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

update buildj

Browse Source
This commit is contained in:
Hatter Jiang
2020-04-05 01:04:31 +08:00
parent c1fb92449e
commit 5f474c47aa
7 changed files with 52 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/tool.rs
View File

@@ -50,11 +50,9 @@ impl BuilderDesc {
pub fn get_builder_bin(&self) -> String {
match &self.bin {
Some(b) => b.clone(),
None => {
match self.name {
BuilderName::Maven => format!("{}/bin/mvn", self.home.clone()),
BuilderName::Gradle => format!("{}/bin/gradle", self.home.clone()),
}
None => match self.name {
BuilderName::Maven => format!("{}/bin/mvn", self.home.clone()),
BuilderName::Gradle => format!("{}/bin/gradle", self.home.clone()),
}
}
}
@@ -105,23 +103,18 @@ pub fn get_local_builder_home_sub(builder_name: BuilderName, local_builder_home_
print_message(MessageType::ERROR, &format!("Cannot find builder home in: {}", local_builder_home_dir));
None
},
Some(p) => {
Some(BuilderDesc{name: builder_name, home: p, bin: None})
},
Some(p) => Some(BuilderDesc{name: builder_name, home: p, bin: None}),
}
}
pub fn get_local_builder_home_sub_first_sub_dir(local_builder_home_dir: &str) -> Option<String> {
let paths = fs::read_dir(Path::new(&local_builder_home_dir)).ok()?;
for path in paths {
match path {
Err(_) => (),
Ok(p) => {
if p.path().is_dir() {
return Some(p.path().to_str()?.to_string());
}
},
};
if let Ok(p) = path {
if p.path().is_dir() {
return Some(p.path().to_str()?.to_string());
}
}
}
None
}