From 94bb52a06b9f697277282197bef87d460a1887f9 Mon Sep 17 00:00:00 2001 From: liushenen <305853782@qq.com> Date: Tue, 31 Oct 2017 15:50:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0shell=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java index 5664bed1aa..c77f10b95d 100644 --- a/utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java +++ b/utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java @@ -114,9 +114,11 @@ public static CommandResult execCmd(final String[] commands, final boolean isRoo errorResult = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8")); String s; while ((s = successResult.readLine()) != null) { + successMsg.append("\n"); successMsg.append(s); } while ((s = errorResult.readLine()) != null) { + errorMsg.append("\n"); errorMsg.append(s); } } From ba039bacdfd96e2b684b51849f75fed225f23500 Mon Sep 17 00:00:00 2001 From: liushenen <305853782@qq.com> Date: Tue, 31 Oct 2017 16:09:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8D=A2=E8=A1=8C?= =?UTF-8?q?=E4=B8=BA=E8=B7=A8=E5=B9=B3=E5=8F=B0=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/blankj/utilcode/util/ShellUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java index c77f10b95d..3eaecdb2f1 100644 --- a/utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java +++ b/utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java @@ -114,8 +114,8 @@ public static CommandResult execCmd(final String[] commands, final boolean isRoo errorResult = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8")); String s; while ((s = successResult.readLine()) != null) { - successMsg.append("\n"); - successMsg.append(s); + successMsg.append(System.getProperty("line.separator")); + successMsg.append(System.getProperty("line.separator")); } while ((s = errorResult.readLine()) != null) { errorMsg.append("\n");