Changeset 506 for AE/Installer/trunk/source/aeinstallerapp.cpp

Timestamp:

Apr 5, 2010, 4:11:45 AM (11 years ago)

Author:

iritscen

Message:

1/4: fixed superfluous BSL2.log
2/4: fixed slightly dubious package updating code
3/4: Mac AEI now trashes old pkgs instead of deleting them, after a pkg update
4/4: added AEI version check to update code so pkgs requiring newer AEI are skipped

File:

• AE/Installer/trunk/source/aeinstallerapp.cpp (modified) (3 diffs)

AE/Installer/trunk/source/aeinstallerapp.cpp

@@ -115 +115 @@
         if (updateStatus) // updateStatus was set when MainWindow::CreateControls() was called during initialization of the window
         {
-                string updateMsg = "An update for the Anniversary Edition is available.\n"; // for some reason we can't set the initial value while using the '+' operator...
-                updateMsg = updateMsg + "Do you wish to update to Edition version " + updateAE.AEVersion + "?\n" +
-                                                        "(Current version is " + currentAE.AEVersion + ")\n"; // ...so we tack the rest on in a second command
+                string updateMsg = "An update for the Anniversary Edition is available.\n"
+                                                   "Do you wish to update to Edition version " + updateAE.AEVersion + "?\n"
+                                                   "(Current version is " + currentAE.AEVersion + ")\n"; // ...so we tack the rest on in a second command
                 wxMessageDialog* updateNotification;
                 
@@ -140 +140 @@
                                         ProcessAEUpdate(&currentAE, &updateAE, &installerJustUpdated);
                                 break;
-                        case UPDATE_THIRD_PARTY: // there's an update with no globalization or Installer strings attached
+                        case UPDATE_PKG_AVAIL: // there's an update with no globalization or Installer strings attached
                                 updateMsg = (string)"One or more third party update(s) for Anniversary Edition package(s) are available.\n" +
                                         (string)"Please note that the AE team assumes no responsibility for the content of third party mods" +
@@ -147 +147 @@
                                 updateNotification = new wxMessageDialog(TheWindow, updateMsg.c_str(), "AE Installer Alert", wxYES_NO | wxICON_EXCLAMATION, wxDefaultPosition);
                                 if (updateNotification->ShowModal() == wxID_YES)
-                                        ProcessThirdPartyUpdates();     
+                                        ProcessPackageUpdates("../updates", "./packages");
                                 break;
                         case UPDATE_GLOB_AVAIL: // there's an update with globalization strings attached