2727import org .openqa .selenium .remote .service .DriverService ;
2828
2929import java .io .*;
30+ import java .nio .charset .Charset ;
3031import java .util .*;
3132import java .util .concurrent .TimeUnit ;
3233
@@ -46,7 +47,8 @@ public final class AppiumServiceBuilder extends DriverService.Builder<AppiumDriv
4647 public static final String DEFAULT_LOCAL_IP_ADDRESS = "0.0.0.0" ;
4748
4849 private static final int DEFAULT_APPIUM_PORT = 4723 ;
49- private final static String BIN_BASH [] = {"/bin/bash" , "-l" , "-c" };
50+ private final static String BIN_BASH = "/bin/bash" ;
51+ private final static String BIN_SH = "/bin/sh" ;
5052 private final static String CMD_EXE [] = {"cmd.exe" , "/C" };
5153 private final static String NODE = "node" ;
5254 private final static String PATH_NAME = getPathVarName ();
@@ -76,10 +78,13 @@ private static String getPathVarName(){
7678
7779 private static String getTheLastStringFromsOutput (InputStream stream ) throws IOException {
7880 BufferedReader reader = new BufferedReader (
79- new InputStreamReader (stream ));
81+ new InputStreamReader (stream , Charset . forName ( "UTF-8" ) ));
8082 String current ;
8183 String result = null ;
8284 while ((current = reader .readLine ()) != null ) {
85+ if (StringUtils .isBlank (current )) {
86+ continue ;
87+ }
8388 result = current ;
8489 }
8590 reader .close ();
@@ -88,6 +93,7 @@ private static String getTheLastStringFromsOutput(InputStream stream ) throws IO
8893
8994 private static Process getSearchingProcess (String ... command ) throws Throwable {
9095 ProcessBuilder processBuilder = new ProcessBuilder (command );
96+ processBuilder .redirectErrorStream (true );
9197 if (!StringUtils .isBlank (PATH_NAME )) {
9298 String path = System .getenv ().get (PATH_NAME );
9399 processBuilder .environment ().put (PATH_NAME , path );
@@ -116,11 +122,11 @@ private File findNodeInCurrentFileSystem(){
116122 try {
117123 if (Platform .getCurrent ().is (Platform .WINDOWS )) {
118124 p = getSearchingProcess (ArrayUtils .add (CMD_EXE , npmScript .getAbsolutePath ()));
125+ p .waitFor ();
119126 }
120127 else {
121- p = getSearchingProcess (ArrayUtils . add ( BIN_BASH , npmScript .getAbsolutePath () ));
128+ p = getSearchingProcess (BIN_SH , npmScript .getAbsolutePath ());
122129 }
123- p .waitFor ();
124130 instancePath = getTheLastStringFromsOutput (p .getInputStream ());
125131 } catch (Throwable e ) {
126132 throw new RuntimeException (e );
@@ -167,7 +173,7 @@ protected File findDefaultExecutable() {
167173 p = getSearchingProcess (ArrayUtils .add (CMD_EXE , NODE ));
168174 }
169175 else {
170- p = getSearchingProcess (ArrayUtils . add ( BIN_BASH , NODE ) );
176+ p = getSearchingProcess (BIN_BASH , "-l" , "-c" , NODE );
171177 }
172178 } catch (Throwable t ) {
173179 throw new RuntimeException (t );
0 commit comments