ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/AE/Installer/trunk/source/installer.cpp

Comparing AE/Installer/trunk/source/installer.cpp (file contents):
Revision 505 by gumby, Sat Mar 27 14:17:32 2010 UTC vs.
Revision 543 by gumby, Mon May 24 19:13:59 2010 UTC

#	Line 27 | Line 27 | using namespace boost::posix_time;
27		// externs declared in installer.h
28		string strInstallCfg = "../GameDataFolder/Add.cfg";
29		string strEUFN = "Edition"; // GetUpdateStatus() may set this to "Edition-patch" later, but this is the assumed name of the new Edition folder in Updates/
30	+	extern MainWindow* TheWindow;
31
32		int globalizeData(void)
33		{
#	Line 231 | Line 232 | int globalizeData(void)
232
233
234		if ( strcmp(levels[i].c_str(), "0") ){
235	<	system((strOniSplit + " -move:overwrite ../GameDataFolder/level" + levels[i] + "_Final ../GameDataFolder/level" + levels[i] + "_Final/AKEV/AKEV*.oni").c_str());
235	>	system((strOniSplit + " -move:overwrite ../GameDataFolder/level" + levels[i] + "_Final ../GameDataFolder/level" + levels[i] +
236	>	"_Final/AKEV/AKEV*.oni").c_str());
237		remove(  "../GameDataFolder/level" + levels[i] + "_Final/AKEV" );
238		}
239
#	Line 245 | Line 247 | int globalizeData(void)
247		for (int i = 0; i < 15; i++)
248		{
249		logfile << "\tReimporting level" << levels[i] << "_Final.oni\n";
250	<	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" + levels[i]+"_Final.oni");
250	>	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" +
251	>	levels[i] + "_Final.oni");
252		logfile << (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
253		+ levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log").c_str() << '\n';
254		string sys_str = (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
#	Line 306 | Line 309 | int globalizeData(void)
309		/* On Mac only, set the current GDF to the AE GDF by writing to Oni's global preferences file (thankfully a standard OS X ".plist" XML file).
310		Tests for presence of prefs with [ -f ] before doing anything so it doesn't create a partial prefs file -- just in case user has never
311		run Oni before :-p */
312	<	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for Edition/ (Oni wants the folder that *contains* the GDF)
312	>	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for Edition/ (Oni wants folder that *contains* the GDF)
313		//bad Iritscen, bad! fixed buffers can cause crashes.
314		/*char prefsCommand[300] = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '";
315		strcat(prefsCommand, fullAEpath.c_str());
#	Line 374 | Line 377 | vector<ModPackage> getPackages(string pa
377		}
378
379		ModPackage fileToModPackage(fstream &file, string modName)
380	<	{
378	<	/*
379	<	This converts a file to a ModPackage struct.
380	<
381	<	A few notes...
382	<	"iter" is the current word we are on. I should have named it "token" or something, but I don't have multiple iterators, so its ok.
383	<	I refer to (*iter) at the beginning of each if statement block. I could probably store it as a variable, but I'm pretty sure that dereferencing a pointer\iterator isn't much
384	<	slower than reading a variable.
385	<	*/
386	<
380	>	{
381		ModPackage package;
382		string line;
383		const string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
#	Line 575 | Line 569 | void recompileAll(vector<string> install
569
570
571		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
572	<	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
572	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +
573	>	dir_itr->path().filename() + " ");
574
575		system(importCommand.c_str());
576		j++;
#	Line 631 | Line 626 | void recompileAll(vector<string> install
626		importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
627
628		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
629	<	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
629	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +
630	>	dir_itr->path().filename() + " ");
631		system(importCommand.c_str());
632		j++;
633		}
#	Line 708 | Line 704 | void recompileAll(vector<string> install
704
705		void copyBSL(string copypath, vector<string>& BSLfolders, ModPackage pkg)
706		{
707	<	ofstream BSLlog("BSL2.log", ios::app );
707	>	ofstream BSLlog("BSL.log", ios::app );
708
709		try {
710		for ( directory_iterator dir_itr( copypath ), end_itr;
#	Line 739 | Line 735 | void copyBSL(string copypath, vector<str
735		copy_file(bsl_itr->path(),  "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
736		}
737		}
738	<	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
739	<	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
738	>	if( !pkg.hasAddon ) {
739	>	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
740	>	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
741	>	}
742		}
743		}
744		}
#	Line 816 | Line 814 | vector<string> getInstallString(string C
814		|                                                          Installer to be replaced (when the new Installer                     |
815		|                                                          launches, this function will be called again but will        |
816		|                                                          return UPDATE_SIMP_AVAIL or UPDATE_GLOB_AVAIL)                       |
817	+	|  UPDATE_PKG_AVAIL                     -- A newer version of individual package(s) is available        |
818		\* UPDATE_CONT_UPD                      -- Currently unused                                                                                */
819		int GetUpdateStatus(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
820		{
#	Line 845 | Line 844 | int GetUpdateStatus(Install_info_cfg *cu
844		return UPDATE_LOG_READ_ERR;
845		}
846
847	<	// Is there an update folder, and is it a monthly release or a patch?
847	>	// Is there an update in the updates/ folder, and is it a monthly release or a patch?
848		bool firstParty = 0;
849	+	// First create the folder if it's missing, so users are never left wondering where updates are supposed to be put
850	+	if (!exists("../updates"))
851	+	create_directory("../updates");
852		if (exists("../updates/Edition"))
853		{
854		firstParty = 1;
#	Line 930 | Line 932 | int GetUpdateStatus(Install_info_cfg *cu
932		}
933		newUpdateLog << "Installer was updated to:\n";
934		newUpdateLog << newUpdateLine.c_str();
935	<	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerAp::OnInit()
935	>	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerApp::OnInit()
936		doneReadingFile = true;
937		newUpdateLog.close();
938		newUpdateLog.clear();
#	Line 969 | Line 971 | int GetUpdateStatus(Install_info_cfg *cu
971		return UPDATE_SIMP_AVAIL;
972		}
973		}
974	<	try {
973	<	directory_iterator end;
974	<	if(exists("../updates")){
975	<	for ( directory_iterator install_iter( "../updates" );
976	<	install_iter != end;
977	<	++install_iter )
974	>	try
975		{
976	<
977	<	ModPackage installedPackage, updatePackage;
978	<	if ( is_directory( install_iter->path() ) && exists( install_iter->path().string() + "/Mod_Info.cfg" ) ) {
979	<	fstream file;
983	<	file.open( (install_iter->path().string() + "/Mod_Info.cfg").c_str());
984	<	if (!file.fail())
985	<	{
986	<	ModPackage updatePackage = fileToModPackage(file, install_iter->path().filename());
987	<	}
988	<	else
989	<	{
990	<	file.close();
991	<	continue;
992	<	}
993	<	if(!exists("packages" + install_iter->path().filename() + "/Mod_Info.cfg"));
994	<	file.close();
995	<	file.open( ("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
996	<	if (!file.fail())
997	<	{
998	<	ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename());
999	<	}
1000	<	else
976	>	directory_iterator end;
977	>	if (exists("../updates"))
978	>	{
979	>	for (directory_iterator install_iter("../updates"); install_iter != end; ++install_iter)
980		{
981	<	file.close();
982	<	return UPDATE_THIRD_PARTY;
983	<	}
984	<	file.close();
985	<	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
986	<	return UPDATE_THIRD_PARTY;
981	>	ModPackage installedPackage, updatePackage;
982	>	if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg"))
983	>	{
984	>	fstream file;
985	>	file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
986	>	if (!file.fail())
987	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
988	>	else
989	>	{
990	>	file.close();
991	>	continue;
992	>	}
993	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
994	>	{
995	>	file.close();
996	>	file.clear();
997	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
998	>	if (!file.fail())
999	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
1000	>	file.close();
1001	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1002	>	{
1003	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1004	>	return UPDATE_PKG_AVAIL;
1005	>	}
1006	>	}
1007	>	else
1008	>	{
1009	>	file.close();
1010	>	return UPDATE_PKG_AVAIL;
1011	>	}
1012	>	}
1013		}
1009	–
1010	–	}
1014		}
1012	–
1013	–	}
1015		}
1016		catch (exception & ex) {
1017		//      setStatusArea("Warning, handled exception: " + (string)ex.what());
1018		}
1018	–
1019
1020		return UPDATE_NO_UPD_AVAIL;
1021		}
#	Line 1030 | Line 1030 | bool ReadInstallInfoCfg(fstream *fileHan
1030		string strDaodanVersion = "Daodan_Version";
1031		string strOniSplitVersion = "OniSplit_Version";
1032		string strGUIWinVersion = "GUI_Win_Version";
1033	<	string strGUIMacVersion = "GUI_Mac_Version";
1033	>	string strGUIMacVersion = "GUI_Mac_Version";
1034		string strReglobalize = "Reglobalize";
1035		string strDeleteList = "Delete_List";
1036		string strArrow = "->";
#	Line 1242 | Line 1242 | bool ProcessInstallerUpdate(Install_info
1242
1243		string popenCommand = "../updates/" + strEUFN + "/install/";
1244		#ifdef WIN32
1245	–	// TODO: Fill in Windows equivalent of code below :-3
1245		popenCommand = "replace_installer.bat";
1246		#else
1247		// We can't just use '~' to mean "the home directory" because we need to check the path in C...
#	Line 1272 | Line 1271 | bool ProcessInstallerUpdate(Install_info
1271		#endif
1272		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1273		}
1275	–	//strPathToEUFNPackages
1276	–
1277	–	void CrawlPackages(string pathToUpdate, string strPathToPackages) {
1278	–	try{
1279	–	directory_iterator end;
1280	–	for ( directory_iterator update_iter( pathToUpdate );
1281	–	update_iter != end;
1282	–	++update_iter )
1283	–	{
1284	–
1285	–	ModPackage installedPackage, updatePackage;
1286	–	string updateStr = update_iter->path().string() + "/Mod_Info.cfg";
1287	–	if ( !boost::iequals(update_iter->path().filename(),"Edition")
1288	–	&& !boost::iequals(update_iter->path().filename(),"Edition-patch")
1289	–	&& is_directory( update_iter->path() )
1290	–	&& exists( update_iter->path().string() + "/Mod_Info.cfg" ) )
1291	–	{
1292	–	bool update = 0;
1293	–	fstream file;
1294	–	file.open( (update_iter->path().string() + "/Mod_Info.cfg").c_str());
1295	–	if (!file.fail())
1296	–	{
1297	–	updatePackage = fileToModPackage(file, update_iter->path().filename());
1298	–	}
1299	–	else
1300	–	{
1301	–	file.close();
1302	–	continue;
1303	–	}
1304	–	if(!exists(strPathToPackages + "/" + update_iter->path().filename() + "/Mod_Info.cfg"));
1305	–	file.close();
1306	–	file.clear();
1307	–	file.open((strPathToPackages + "/" + update_iter->path().filename() + "/Mod_Info.cfg").c_str());
1308	–	if (!file.fail())
1309	–	{
1310	–	installedPackage = fileToModPackage(file, update_iter->path().filename());
1311	–	file.close();
1312	–	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
1313	–	remove_all((path)(strPathToPackages +  "/" + installedPackage.modStringName));
1314	–	update = 1;
1315	–	}
1316	–	}
1317	–	else
1318	–	{
1319	–	file.close();
1320	–	update = 1;
1321	–	}
1322	–	file.close();
1323	–
1324	–	if(update) {
1325	–	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1326	–
1327	–	}
1328	–	}
1329	–	}
1330	–	}
1331	–	catch (exception & ex) {
1332	–	//      ex.what();
1333	–	setStatusArea("Warning, handled exception: " + (string)ex.what());
1334	–	}
1335	–	}
1336	–
1337	–
1338	–	bool ProcessThirdPartyUpdates() {
1339	–	CrawlPackages( "../updates",  "./packages");
1340	–	return true;
1341	–	//      globalPackages = getPackages();
1342	–	//      refreshMods(globalInstalledMods);
1343	–	}
1344	–
1274
1275		bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
1276		{
1277	+	try {
1278		fstream file;
1279		string line;
1280		vector<string> tokens, updateStarted;
#	Line 1364 | Line 1294 | bool ProcessAEUpdate(Install_info_cfg *c
1294		string strOniApp = "Oni.exe";
1295		#else
1296		string strOniApp = "Oni.app";
1367	–	#endif
1297		bool needNewTrashDir = false;
1298	+	#endif
1299	+
1300		bool readingVerAndDate = false;
1301
1371	–	// TODO: Fill in Windows equivalent of code below
1302		#ifdef WIN32
1303	<	string strTrashDir = "Trash\\";
1303	>	//string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1304		#else
1305		FILE *fUserName = NULL;
1306		char chrUserName[32];
#	Line 1405 | Line 1335 | bool ProcessAEUpdate(Install_info_cfg *c
1335		if (readingVerAndDate && tokens.capacity() >= 3)
1336		tokenize(tokens[2], updateStarted, "-");
1337		}
1338	+	#ifndef WIN32
1339		if (updateStarted.capacity() < 3)
1340		needNewTrashDir = true;
1341		else
#	Line 1414 | Line 1345 | bool ProcessAEUpdate(Install_info_cfg *c
1345		if (!exists(strTrashDir))
1346		needNewTrashDir = true;
1347		}
1348	+	#endif
1349		}
1350		#ifndef WIN32
1351		if (!*installerJustUpdated || needNewTrashDir) // prepare a new directory for deleted files to go to
#	Line 1431 | Line 1363 | bool ProcessAEUpdate(Install_info_cfg *c
1363		if (exists(strPathToEUFN + strOniApp))
1364		{
1365		if (exists(strOniApp))
1366	+	#ifdef WIN32
1367	+	remove((path)strOniApp);
1368	+	#else
1369		rename((path)strOniApp, (path)(strTrashDir + strOniApp));
1370	+	#endif
1371		rename((path)(strPathToEUFN + strOniApp), (path)strOniApp);
1372		}
1373		if (updateAE->OniSplitVersion.compare(currentAE->OniSplitVersion) >= 1)
#	Line 1439 | Line 1375 | bool ProcessAEUpdate(Install_info_cfg *c
1375		if (exists(strPathToEUFNInstall + strOniSplit))
1376		{
1377		if (exists(strOniSplit))
1378	+	#ifdef WIN32
1379	+	remove((path)strOniSplit);
1380	+	#else
1381		rename((path)strOniSplit, (path)(strTrashDir + strOniSplit));
1382	+	#endif
1383		rename((path)(strPathToEUFNInstall + strOniSplit), (path)strOniSplit);
1384		}
1385		}
#	Line 1449 | Line 1389 | bool ProcessAEUpdate(Install_info_cfg *c
1389		if (exists(strPathToEUFN + strDaodan))
1390		{
1391		if (exists(("../" + strDaodan)))
1392	<	rename((path)("../" + strDaodan), (path)(strTrashDir + strDaodan));
1392	>	remove((path)("../" + strDaodan));
1393		rename((path)(strPathToEUFN + strDaodan), (path)("../" + strDaodan));
1394		}
1395		}
#	Line 1458 | Line 1398 | bool ProcessAEUpdate(Install_info_cfg *c
1398		if (exists(strPathToEUFNInstall + strWinGUI))
1399		{
1400		if (exists((path)strWinGUI))
1401	<	rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
1401	>	remove((path)strWinGUI);
1402		if (exists(strWinGUILang))
1403	<	rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
1403	>	remove((path)strWinGUILang);
1404		rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
1405		rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
1406		}
#	Line 1493 | Line 1433 | bool ProcessAEUpdate(Install_info_cfg *c
1433		while (curPos != string::npos && curPos < thePath.size())
1434		{
1435		aParentPath = aParentPath + thePath.substr(lastPos, curPos - lastPos);
1436	+	#ifndef WIN32
1437		if (!exists(strTrashDir + aParentPath))
1438		create_directory(strTrashDir + aParentPath);
1439	+	#endif
1440		lastPos = curPos + 1;
1441		curPos = thePath.find("/", lastPos);
1442		aParentPath = aParentPath + "/";
#	Line 1507 | Line 1449 | bool ProcessAEUpdate(Install_info_cfg *c
1449		}
1450		}
1451
1452	<	CrawlPackages( strPathToEUFNPackages,  strPathToPackages);
1452	>	ProcessPackageUpdates(strPathToEUFNPackages, strPathToPackages);
1453
1454		// Next, we get a list of which files and folders in the update's Globalize folder to move over; all files not starting with '.' will be moved...
1455		// ...and folders which do not exist in the current AE will be created there
#	Line 1539 | Line 1481 | bool ProcessAEUpdate(Install_info_cfg *c
1481		for (vector<string>::iterator iter = filesToMove.begin(); iter != filesToMove.end(); iter++)
1482		{
1483		if (exists(strPathToPackages + strGlobalize + *iter))
1484	+	#ifdef WIN32
1485	+	remove((path)(strPathToPackages + strGlobalize + *iter));
1486	+	#else
1487		rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter));
1488	+	#endif
1489		rename((path)(strPathToEUFNPackages + strGlobalize + *iter), (path)(strPathToPackages + strGlobalize + *iter));
1490		}
1491
1492		// Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE
1493	+	#ifdef WIN32
1494	+	remove((path)strPathToEUFN);
1495	+	#else
1496		create_directory(strTrashDir + "Unneeded update files");
1497		rename((path)strPathToEUFN, (path)(strTrashDir + "Unneeded update files/" + strEUFN));
1498	<
1498	>	#endif
1499		// Write to log that we are finished with update
1500		ptime end_time(second_clock::local_time());
1501		string progressMsg2 = "Edition was updated to:\n" +
#	Line 1564 | Line 1513 | bool ProcessAEUpdate(Install_info_cfg *c
1513		CheckForGlobalization(true); // the 'true' value forces re-globalization
1514
1515		globalPackages = getPackages(); // refresh the list in memory
1516	<	// TODO: Refresh the packages list in the window
1517	<
1516	>	wxCommandEvent e;
1517	>	TheWindow->OnRefreshButtonClick( e );
1518		return true;
1519	+	}
1520	+	catch (exception & ex)
1521	+	{
1522	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1523	+	return false;
1524	+	}
1525	+
1526	+	}
1527	+
1528	+	void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1529	+	{
1530	+	ptime startTime(second_clock::local_time());
1531	+	#ifdef WIN32
1532	+	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1533	+	#else
1534	+	FILE *fUserName = NULL;
1535	+	char chrUserName[32];
1536	+	fUserName = popen("whoami", "r");
1537	+	fgets(chrUserName, sizeof(chrUserName), fUserName);
1538	+	pclose(fUserName);
1539	+	string strUserName = (string)chrUserName; // stringsblaaarrrgggghhhh
1540	+	int endOfName = strUserName.find("\n", 0);
1541	+	string strTrashDir = "/Users/" + strUserName.substr(0, endOfName) + "/.Trash/";
1542	+	bool needNewTrashDir = true;
1543	+	tm tmStartTime = to_tm(startTime);
1544	+	#endif
1545	+
1546	+	try
1547	+	{
1548	+	directory_iterator end;
1549	+	for (directory_iterator update_iter(pathToUpdate); update_iter != end; ++update_iter)
1550	+	{
1551	+	ModPackage installedPackage, updatePackage;
1552	+	string updtPath = update_iter->path().string();
1553	+	string updtFolder = update_iter->path().filename();
1554	+	string updtModInfo = updtPath + "/Mod_Info.cfg";
1555	+	string instModInfo = strPathToPackages + "/" + updtFolder + "/Mod_Info.cfg";
1556	+	if (!boost::iequals(updtFolder, "Edition")
1557	+	&& !boost::iequals(updtFolder, "Edition-patch")
1558	+	&& is_directory(update_iter->path())
1559	+	&& exists(updtModInfo))
1560	+	{
1561	+	fstream file;
1562	+	file.open((updtModInfo).c_str());
1563	+	if (!file.fail())
1564	+	updatePackage = fileToModPackage(file, updtFolder);
1565	+	else
1566	+	{
1567	+	file.close();
1568	+	continue;
1569	+	}
1570	+	if (exists(instModInfo))
1571	+	{
1572	+	file.close();
1573	+	file.clear();
1574	+	file.open(instModInfo.c_str());
1575	+	if (!file.fail())
1576	+	{
1577	+	installedPackage = fileToModPackage(file, updtFolder);
1578	+	}
1579	+	file.close();
1580	+	}
1581	+	file.close();
1582	+	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1583	+	{
1584	+	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1585	+	{
1586	+	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1587	+	#ifdef WIN32
1588	+	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1589	+	#else
1590	+	if (needNewTrashDir)
1591	+	{
1592	+	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1593	+	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1594	+	create_directory(strTrashDir);
1595	+	needNewTrashDir = false;
1596	+	}
1597	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1598	+	#endif
1599	+	}
1600	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1601	+	}
1602	+	}
1603	+	}
1604	+	}
1605	+	}
1606	+	catch (exception & ex)
1607	+	{
1608	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1609	+	}
1610	+	wxCommandEvent e;
1611	+	TheWindow->OnRefreshButtonClick( e );
1612		}
1613
1614		/* MakePathLocalToGlobalize is a function used once by ProcessAEUpdate() that takes a file in an        \

Diff Legend

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