Merge pull request #302 from BolexLiu/master

Blankj · web-flow · commit b158245f70f8 · 2017-10-31T03:10:35.000-05:00
添加shell返回换行
diff --git 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(s);
+                    successMsg.append(System.getProperty("line.separator"));
+                    successMsg.append(System.getProperty("line.separator"));
                 }
                 while ((s = errorResult.readLine()) != null) {
+                    errorMsg.append("\n");
                     errorMsg.append(s);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,11 @@ public static CommandResult execCmd(final String[] commands, final boolean isRoo`
`114`	`114`	`errorResult = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8"));`
`115`	`115`	`String s;`
`116`	`116`	`while ((s = successResult.readLine()) != null) {`
`117`		`- successMsg.append(s);`
	`117`	`+ successMsg.append(System.getProperty("line.separator"));`
	`118`	`+ successMsg.append(System.getProperty("line.separator"));`
`118`	`119`	`}`
`119`	`120`	`while ((s = errorResult.readLine()) != null) {`
	`121`	`+ errorMsg.append("\n");`
`120`	`122`	`errorMsg.append(s);`
`121`	`123`	`}`
`122`	`124`	`}`