Changeset 702 for AE/installer2/src/net/oni2/aeinstaller/backend/appexecution

Timestamp:

Mar 19, 2013, 11:00:06 AM (12 years ago)

Author:

alloc

Message:

AEI2 0.99u:

• Fixed a few bugs in apply patches
• Added some log output to apply patches

Location:

AE/installer2/src/net/oni2/aeinstaller/backend/appexecution

Files:

• . (added)
• AppExecution.java (moved) (moved from AE/installer2/src/net/oni2/aeinstaller/backend/AppExecution.java ) (4 diffs)
• AppExecutionResult.java (added)

AE/installer2/src/net/oni2/aeinstaller/backend/appexecution/AppExecution.java

@@ -1 @@
-package net.oni2.aeinstaller.backend;
+package net.oni2.aeinstaller.backend.appexecution;
 
 import java.io.BufferedReader;
@@ -13 +13 @@
  */
 public class AppExecution {
-
         /**
          * Execute a short running application and wait for termination
@@ -19 +18 @@
          * @param cmdLine
          *            List of command and arguments
-         * @return List of output lines
+         * @return Error code and list of output lines
          * @throws IOException
          *             Exc
          */
-        public static Vector<String> executeAndWait(List<String> cmdLine)
+        public static AppExecutionResult executeAndWait(Vector<String> cmdLine)
                         throws IOException {
                 ProcessBuilder pb = new ProcessBuilder(cmdLine);
@@ -39 +38 @@
                         lines.add(line);
                 }
-                return lines;
+                try {
+                        proc.waitFor();
+                } catch (InterruptedException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+                return new AppExecutionResult(proc.exitValue(), cmdLine, lines);
         }