ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/AE/Installer/trunk/source/installer.cpp
(Generate patch)

Comparing AE/Installer/trunk/source/installer.cpp (file contents):
Revision 549 by gumby, Wed May 26 23:04:56 2010 UTC vs.
Revision 550 by gumby, Wed May 26 23:28:22 2010 UTC

# Line 1384 | Line 1384 | bool ProcessAEUpdate(Install_info_cfg *c
1384          // Special code to replace our special files -- the Oni app, OniSplit, the Daodan DLL, and the GUI for OniSplit
1385          if (exists(strPathToEUFN + strOniApp))
1386          {
1387 <                if (exists(strOniApp))
1387 >                if (exists("../" + strOniApp))
1388   #ifdef WIN32
1389 <                        remove((path)strOniApp);
1389 >                        remove((path)("../" + strOniApp));
1390   #else
1391 <                        rename((path)strOniApp, (path)(strTrashDir + strOniApp));
1391 >                        rename((path)("../" + strOniApp), (path)(strTrashDir + strOniApp));
1392   #endif
1393 <                rename((path)(strPathToEUFN + strOniApp), (path)strOniApp);
1393 >                rename((path)(strPathToEUFN + strOniApp), (path)("../" + strOniApp));
1394          }
1395          if (updateAE->OniSplitVersion.compare(currentAE->OniSplitVersion) >= 1)
1396          {
# Line 1513 | Line 1513 | bool ProcessAEUpdate(Install_info_cfg *c
1513          
1514          // Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE
1515   #ifdef WIN32
1516 <        remove((path)strPathToEUFN);
1516 >        remove_all((path)strPathToEUFN);
1517   #else
1518          create_directory(strTrashDir + "Unneeded update files");
1519          rename((path)strPathToEUFN, (path)(strTrashDir + "Unneeded update files/" + strEUFN));

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)