Changeset 702 for AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java

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

File:

• AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java (modified) (5 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java

@@ -10 +10 @@
 import java.util.Vector;
 
+import net.oni2.aeinstaller.backend.appexecution.AppExecution;
+import net.oni2.aeinstaller.backend.appexecution.AppExecutionResult;
+
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.StaxDriver;
@@ -79 +82 @@
                 cmd.add("which");
                 cmd.add("wine");
-                Vector<String> res = null;
+                AppExecutionResult res = null;
                 try {
                         res = AppExecution.executeAndWait(cmd);
@@ -86 +89 @@
                 }
                 if (res != null) {
-                        if (res.get(0).startsWith("/") && res.get(0).endsWith("wine")) {
-                                return res.get(0);
+                        if (res.output.get(0).startsWith("/") && res.output.get(0).endsWith("wine")) {
+                                return res.output.get(0);
                         }
                 }
@@ -133 +136 @@
                                 cmd.add("getconf");
                                 cmd.add("LONG_BIT");
-                                Vector<String> res = null;
+                                AppExecutionResult res = null;
                                 try {
                                         res = AppExecution.executeAndWait(cmd);
@@ -140 +143 @@
                                 }
                                 if (res != null) {
-                                        if (res.get(0).equals("64"))
+                                        if (res.output.get(0).equals("64"))
                                                 return Architecture.AMD64;
                                 }