mirror of
https://github.com/jht5945/buildj.git
synced 2025-12-29 18:30:05 +08:00
opt string
This commit is contained in:
@@ -126,11 +126,7 @@ fn do_with_buildin_arg_builder(first_arg: &str, args: &[String], builder_name: &
|
|||||||
}
|
}
|
||||||
print_message(MessageType::OK, &format!("BUILDER_HOME = {}", &builder_desc.home));
|
print_message(MessageType::OK, &format!("BUILDER_HOME = {}", &builder_desc.home));
|
||||||
|
|
||||||
let mut new_env = if has_java {
|
let mut new_env = iff!(has_java, get_env_with_java_home(&java_home), get_env());
|
||||||
get_env_with_java_home(&java_home)
|
|
||||||
} else {
|
|
||||||
get_env()
|
|
||||||
};
|
|
||||||
for builder_home_name in builder_desc.get_builder_home_name() {
|
for builder_home_name in builder_desc.get_builder_home_name() {
|
||||||
new_env.insert(builder_home_name, builder_desc.home.clone());
|
new_env.insert(builder_home_name, builder_desc.home.clone());
|
||||||
}
|
}
|
||||||
|
|||||||
26
src/tool.rs
26
src/tool.rs
@@ -2,18 +2,17 @@ use std::{
|
|||||||
fs::{self, File},
|
fs::{self, File},
|
||||||
path::Path,
|
path::Path,
|
||||||
};
|
};
|
||||||
|
use rust_util::{
|
||||||
|
XResult,
|
||||||
|
new_box_ioerror,
|
||||||
|
util_os::is_macos_or_linux,
|
||||||
|
util_msg::{
|
||||||
|
print_message,
|
||||||
|
MessageType,
|
||||||
|
},
|
||||||
|
};
|
||||||
use super::{
|
use super::{
|
||||||
http,
|
http,
|
||||||
rust_util::{
|
|
||||||
XResult,
|
|
||||||
new_box_ioerror,
|
|
||||||
util_os::is_macos_or_linux,
|
|
||||||
util_msg::{
|
|
||||||
print_message,
|
|
||||||
MessageType,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
local_util::{self, *},
|
local_util::{self, *},
|
||||||
misc::*,
|
misc::*,
|
||||||
};
|
};
|
||||||
@@ -60,8 +59,7 @@ impl BuilderDesc {
|
|||||||
|
|
||||||
pub fn get_builder_home(builder: &str, version: &str) -> Option<BuilderDesc> {
|
pub fn get_builder_home(builder: &str, version: &str) -> Option<BuilderDesc> {
|
||||||
let local_builder_home_base_dir = match get_user_home_dir(LOCAL_BUILDER_HOME_BASE_DIR) {
|
let local_builder_home_base_dir = match get_user_home_dir(LOCAL_BUILDER_HOME_BASE_DIR) {
|
||||||
Err(_) => return None,
|
Ok(o) => o, Err(_) => return None,
|
||||||
Ok(o) => o,
|
|
||||||
};
|
};
|
||||||
let builder_name = match builder {
|
let builder_name = match builder {
|
||||||
"maven" => BuilderName::Maven,
|
"maven" => BuilderName::Maven,
|
||||||
@@ -185,7 +183,7 @@ pub fn get_tool_package_detail(name: &str, version: &str) -> XResult<String> {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut url = String::new();
|
let mut url = String::with_capacity(1024);
|
||||||
match secret {
|
match secret {
|
||||||
None => {
|
None => {
|
||||||
url.push_str(TOOL_PACKAGE_DETAIL_URL_WITHOUT_AUTH);
|
url.push_str(TOOL_PACKAGE_DETAIL_URL_WITHOUT_AUTH);
|
||||||
@@ -228,7 +226,7 @@ pub fn get_and_extract_tool_package(base_dir: &str, dir_with_name: bool, name: &
|
|||||||
return Err(new_box_ioerror(&format!("Required version not match, {}: {} vs {}", name, version, &v)));
|
return Err(new_box_ioerror(&format!("Required version not match, {}: {} vs {}", name, version, &v)));
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut target_base_dir = String::new();
|
let mut target_base_dir = String::with_capacity(512);
|
||||||
target_base_dir.push_str(base_dir);
|
target_base_dir.push_str(base_dir);
|
||||||
if dir_with_name {
|
if dir_with_name {
|
||||||
target_base_dir.push_str("/");
|
target_base_dir.push_str("/");
|
||||||
|
|||||||
Reference in New Issue
Block a user