1
0
mirror of https://github.com/jht5945/buildj.git synced 2025-12-27 17:20:06 +08:00

add +BUILDJ_JAVA_NAME

This commit is contained in:
2019-08-30 08:42:56 +08:00
parent 307ea70dca
commit 23cbea60e9
3 changed files with 15 additions and 7 deletions

View File

@@ -28,6 +28,10 @@ const MACOS_LIBEXEC_JAVAHOME: &str = "/usr/libexec/java_home";
pub const LOCAL_JAVA_HOME_BASE_DIR: &str = ".jssp/jdks";
lazy_static! {
pub static ref BUILDJ_JAVA_NAME: Option<String> = env::var("BUILDJ_JAVA_NAME").ok();
}
pub fn get_java_home(version: &str) -> Option<String> {
match get_macos_java_home(version) {
Some(j) => Some(j),
@@ -46,12 +50,15 @@ pub fn get_cloud_java(version: &str) -> bool {
if ! is_macos_or_linux() {
return false;
}
let cloud_java_names = if is_macos() {
vec![OPENJDK_MACOS]
} else if is_linux() {
vec![JDK_LINUX, OPENJDK_LINUX]
} else {
vec![]
let cloud_java_names = match &*BUILDJ_JAVA_NAME {
None => if is_macos() {
vec![OPENJDK_MACOS]
} else if is_linux() {
vec![JDK_LINUX, OPENJDK_LINUX]
} else {
vec![]
},
Some(buildj_java_name) => vec![buildj_java_name.as_str()],
};
let local_java_home_base_dir = match local_util::get_user_home_dir(LOCAL_JAVA_HOME_BASE_DIR) {
Err(_) => return false,

View File

@@ -68,7 +68,7 @@ pub fn calc_sha256(d: &[u8]) -> String {
sha256.result_str()
}
pub fn calc_file_digest(digest: &mut Digest, digest_alg: &str, file_name: &str) -> XResult<String> {
pub fn calc_file_digest(digest: &mut dyn Digest, digest_alg: &str, file_name: &str) -> XResult<String> {
let mut buf: [u8; DEFAULT_BUF_SIZE] = [0u8; DEFAULT_BUF_SIZE];
let mut f = File::open(file_name)?;
let file_len = match f.metadata() {

View File

@@ -24,6 +24,7 @@ buildj :::gradle<version> [--java<version>] - run gradle with assigned v
e.g. buildj :::gradle3.5.1 --java1.8 ARGS
buildj - run build, run assigned version builder tool
BUILDJ_VERBOSE=1 buildj - run buildj in verbose mode
BUILDJ_JAVA_NAME=jdk-name buildj - assgin java name, e.g. adoptjdk-linux
"#);
}