Changeset 625 for AE/installer2/src/net/oni2/aeinstaller/backend

Timestamp:

Jan 16, 2013, 5:12:24 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.85:

• Added intro/outro copy and settings
• Added tool manager dialog (empty for now)
• AEI uses jar-path as working location again. Only uses workingdirectory if run with -debug now

Location:

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

Files:

• Paths.java (modified) (1 diff)
• Settings.java (modified) (1 diff)
• oni/Installer.java (modified) (1 diff)

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

@@ -16 +16 @@
          */
         public static File getInstallerPath() {
-//              String jarPath = Settings.class.getProtectionDomain().getCodeSource()
-//                              .getLocation().getPath();
-//              String decodedPath = null;
-//              try {
-//                      decodedPath = URLDecoder.decode(jarPath, "UTF-8");
-//              } catch (UnsupportedEncodingException e) {
-//                      e.printStackTrace();
-//              }
-//              return new File(decodedPath).getParentFile();
-                String wd = System.getProperty("user.dir");
-                return new File(wd);
+                if (Settings.isDebug()) {
+                        String wd = System.getProperty("user.dir");
+                        return new File(wd);
+                } else {
+                        String jarPath = Settings.class.getProtectionDomain()
+                                        .getCodeSource().getLocation().getPath();
+                        String decodedPath = null;
+                        try {
+                                decodedPath = URLDecoder.decode(jarPath, "UTF-8");
+                        } catch (UnsupportedEncodingException e) {
+                                e.printStackTrace();
+                        }
+                        return new File(decodedPath).getParentFile();
+                }
         }
 

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

@@ -112 +112 @@
          * @return Is debug run
          */
-        public static boolean getDebug() {
+        public static boolean isDebug() {
                 return debugRun;
         }

AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java

@@ -244 +244 @@
                 combineBSLFolders(mods, listener);
 
+                if (Settings.getInstance().get("copyintro", false)) {
+                        File src = new File(Paths.getVanillaGDF(), "intro.bik");
+                        if (src.exists()) {
+                                try {
+                                        FileUtils.copyFileToDirectory(src, Paths.getEditionGDF());
+                                } catch (IOException e) {
+                                        e.printStackTrace();
+                                }
+                        }
+                }
+                if (Settings.getInstance().get("copyoutro", true)) {
+                        File src = new File(Paths.getVanillaGDF(), "outro.bik");
+                        if (src.exists()) {
+                                try {
+                                        FileUtils.copyFileToDirectory(src, Paths.getEditionGDF());
+                                } catch (IOException e) {
+                                        e.printStackTrace();
+                                }
+                        }
+                }
+
                 if (unlockLevels.size() > 0) {
                         File dat = new File(Paths.getEditionBasePath(), "persist.dat");