11/*******************************************************************************
2- * Copyright (c) 2019, 2022 Red Hat Inc. and others.
2+ * Copyright (c) 2019, 2024 Red Hat Inc. and others.
33 *
44 * This program and the accompanying materials are made
55 * available under the terms of the Eclipse Public License 2.0
2020import java .io .File ;
2121import java .io .IOException ;
2222import java .io .InputStream ;
23- import java .io .InputStreamReader ;
2423import java .net .URL ;
2524import java .util .ArrayList ;
2625import java .util .Arrays ;
@@ -206,8 +205,7 @@ public static File which(String program) {
206205 } else if (Platform .getOS ().equals (Platform .OS_MACOSX )) {
207206 command = new String [] { getDefaultShellMacOS (), "-c" , "-li" , "which " + program };
208207 }
209- try (BufferedReader reader = new BufferedReader (
210- new InputStreamReader (Runtime .getRuntime ().exec (command ).getInputStream ()));) {
208+ try (BufferedReader reader = Runtime .getRuntime ().exec (command ).inputReader ()) {
211209 res = reader .readLine ();
212210 } catch (IOException e ) {
213211 ILog .get ().error (e .getMessage (), e );
@@ -297,8 +295,7 @@ private static final File getNodeJsExecutablen(File installationLocation, Proper
297295 private static String getDefaultShellMacOS () {
298296 String res = null ;
299297 String [] command = { "/bin/bash" , "-c" , "-l" , "dscl . -read ~/ UserShell" };
300- try (BufferedReader reader = new BufferedReader (
301- new InputStreamReader (Runtime .getRuntime ().exec (command ).getInputStream ()));) {
298+ try (BufferedReader reader = Runtime .getRuntime ().exec (command ).inputReader ()) {
302299 res = reader .readLine ();
303300 if (!res .startsWith (MACOS_DSCL_SHELL_PREFIX )) {
304301 ILog .get ().error ("Cannot find default shell. Use '/bin/zsh' instead." );
@@ -323,8 +320,7 @@ private static void validateNodeVersion(File nodeJsLocation) {
323320 String nodeVersion = null ;
324321 String [] nodeVersionCommand = { nodeJsLocation .getAbsolutePath (), "-v" };
325322
326- try (BufferedReader reader = new BufferedReader (
327- new InputStreamReader (Runtime .getRuntime ().exec (nodeVersionCommand ).getInputStream ()));) {
323+ try (BufferedReader reader = Runtime .getRuntime ().exec (nodeVersionCommand ).inputReader ()) {
328324 nodeVersion = reader .readLine ();
329325 } catch (IOException e ) {
330326 ILog .get ().error (e .getMessage (), e );
0 commit comments