Changeset 543

Timestamp:

May 24, 2010, 9:13:59 PM (15 years ago)

Author:

gumby

Message:

Fixed PC issues, added exception handling.

File:

• AE/Installer/trunk/source/installer.cpp (modified) (11 diffs)

AE/Installer/trunk/source/installer.cpp

@@ -1275 +1275 @@
 bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
 {
+        try {
         fstream file;
         string line;
@@ -1294 +1295 @@
 #else
         string strOniApp = "Oni.app";
-#endif
         bool needNewTrashDir = false;
+#endif
+        
         bool readingVerAndDate = false;
         
 #ifdef WIN32
-        string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
+        //string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
 #else
         FILE *fUserName = NULL;
@@ -1334 +1336 @@
                                 tokenize(tokens[2], updateStarted, "-");
                 }
+#ifndef WIN32
                 if (updateStarted.capacity() < 3)
                         needNewTrashDir = true;
@@ -1343 +1346 @@
                                 needNewTrashDir = true;
                 }
+#endif
         }
 #ifndef WIN32
@@ -1360 +1364 @@
         {
                 if (exists(strOniApp))
+#ifdef WIN32
+                        remove((path)strOniApp);
+#else
                         rename((path)strOniApp, (path)(strTrashDir + strOniApp));
+#endif
                 rename((path)(strPathToEUFN + strOniApp), (path)strOniApp);
         }
@@ -1368 +1376 @@
                 {
                         if (exists(strOniSplit))
+#ifdef WIN32
+                                remove((path)strOniSplit);
+#else
                                 rename((path)strOniSplit, (path)(strTrashDir + strOniSplit));
+#endif
                         rename((path)(strPathToEUFNInstall + strOniSplit), (path)strOniSplit);
                 }
@@ -1378 +1390 @@
                 {
                         if (exists(("../" + strDaodan)))
-                                rename((path)("../" + strDaodan), (path)(strTrashDir + strDaodan));
+                                remove((path)("../" + strDaodan));
                         rename((path)(strPathToEUFN + strDaodan), (path)("../" + strDaodan));
                 }
@@ -1387 +1399 @@
                 {
                         if (exists((path)strWinGUI))
-                                rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
+                                remove((path)strWinGUI);
                         if (exists(strWinGUILang))
-                                rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
+                                remove((path)strWinGUILang);
                         rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
                         rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
@@ -1422 +1434 @@
                         {
                                 aParentPath = aParentPath + thePath.substr(lastPos, curPos - lastPos);
+#ifndef WIN32
                                 if (!exists(strTrashDir + aParentPath))
                                         create_directory(strTrashDir + aParentPath);
+#endif
                                 lastPos = curPos + 1;
                                 curPos = thePath.find("/", lastPos);
@@ -1468 +1482 @@
         {
                 if (exists(strPathToPackages + strGlobalize + *iter))
+#ifdef WIN32
+                        remove((path)(strPathToPackages + strGlobalize + *iter));
+#else
                         rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter));
+#endif
                 rename((path)(strPathToEUFNPackages + strGlobalize + *iter), (path)(strPathToPackages + strGlobalize + *iter));
         }
         
         // Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE
+#ifdef WIN32
+        remove((path)strPathToEUFN);
+#else
         create_directory(strTrashDir + "Unneeded update files");
         rename((path)strPathToEUFN, (path)(strTrashDir + "Unneeded update files/" + strEUFN));
-        
+#endif
         // Write to log that we are finished with update
         ptime end_time(second_clock::local_time());
@@ -1496 +1517 @@
         TheWindow->OnRefreshButtonClick( e );
         return true;
+        }
+        catch (exception & ex)
+        {
+                setStatusArea("Warning, handled exception: " + (string)ex.what());
+                return false;
+        }
+        
 }