From b1db771baa1d3aabd893a0d1790e2e36abc994b6 Mon Sep 17 00:00:00 2001 From: filip Date: Mon, 2 Aug 2021 19:13:29 +0200 Subject: fix(rlang): module not working on MacOs (#2880) Fix rlang module and refactor other modules to use new method. --- src/modules/java.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/modules/java.rs') diff --git a/src/modules/java.rs b/src/modules/java.rs index 2829b98c7..754fe89ae 100644 --- a/src/modules/java.rs +++ b/src/modules/java.rs @@ -1,5 +1,6 @@ use crate::configs::java::JavaConfig; use crate::formatter::{StringFormatter, VersionFormatter}; +use crate::utils::get_command_string_output; use std::path::PathBuf; use super::{Context, Module, RootModuleConfig}; @@ -64,12 +65,8 @@ fn get_java_version(context: &Context, config: &JavaConfig) -> Option { }) .unwrap_or_else(|| String::from("java")); - let output = context.exec_cmd(&java_command, &["-Xinternalversion"])?; - let java_version = if output.stdout.is_empty() { - output.stderr - } else { - output.stdout - }; + let command = context.exec_cmd(&java_command, &["-Xinternalversion"])?; + let java_version = get_command_string_output(command); format_java_version(&java_version, config.version_format) } -- cgit v1.2.3