From: <mg...@us...> - 2008-08-16 16:00:28
|
Revision: 2072 http://planeshift.svn.sourceforge.net/planeshift/?rev=2072&view=rev Author: mgist Date: 2008-08-16 16:00:37 +0000 (Sat, 16 Aug 2008) Log Message: ----------- - Fixed some more bugs from the last updater changes. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-08-16 15:14:15 UTC (rev 2071) +++ trunk/src/pslaunch/updaterengine.cpp 2008-08-16 16:00:37 UTC (rev 2072) @@ -163,6 +163,7 @@ { delete downloader; downloader = NULL; + fileUtil->RemoveFile(UPDATERINFO_FILENAME, true); return; } @@ -176,6 +177,7 @@ // Begin the self update process. SelfUpdate(false); + fileUtil->RemoveFile(UPDATERINFO_FILENAME, true); return; } @@ -204,6 +206,7 @@ { delete downloader; downloader = NULL; + fileUtil->RemoveFile(UPDATERINFO_FILENAME, true); return; } } @@ -223,6 +226,7 @@ delete downloader; downloader = NULL; infoShare->SetUpdateNeeded(false); + fileUtil->RemoveFile(UPDATERINFO_FILENAME, true); } bool UpdaterEngine::CheckUpdater() @@ -843,7 +847,7 @@ // Add version info to updaterinfo.xml and oldCvs. csString value("<version name=\""); value.AppendFmt("%s\" />", newCv->GetName()); - confignode->GetNode("client")->CreateNodeBefore(CS_NODE_TEXT)->SetValue(value); + confignode->GetNode("client")->CreateNodeBefore(CS_NODE_ELEMENT)->SetValue(value); updaterinfo->Write(vfs, UPDATERINFO_CURRENT_FILENAME); oldCvs.PushSmart(newCv); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-08-16 16:30:42
|
Revision: 2073 http://planeshift.svn.sourceforge.net/planeshift/?rev=2073&view=rev Author: mgist Date: 2008-08-16 16:30:51 +0000 (Sat, 16 Aug 2008) Log Message: ----------- - Better fix. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-08-16 16:00:37 UTC (rev 2072) +++ trunk/src/pslaunch/updaterengine.cpp 2008-08-16 16:30:51 UTC (rev 2073) @@ -163,7 +163,6 @@ { delete downloader; downloader = NULL; - fileUtil->RemoveFile(UPDATERINFO_FILENAME, true); return; } @@ -177,7 +176,6 @@ // Begin the self update process. SelfUpdate(false); - fileUtil->RemoveFile(UPDATERINFO_FILENAME, true); return; } @@ -206,7 +204,6 @@ { delete downloader; downloader = NULL; - fileUtil->RemoveFile(UPDATERINFO_FILENAME, true); return; } } @@ -226,12 +223,12 @@ delete downloader; downloader = NULL; infoShare->SetUpdateNeeded(false); - fileUtil->RemoveFile(UPDATERINFO_FILENAME, true); } bool UpdaterEngine::CheckUpdater() { // Download the latest updaterinfo. + fileUtil->RemoveFile(UPDATERINFO_FILENAME, true); if(!downloader->DownloadFile("updaterinfo.xml", UPDATERINFO_FILENAME, false, true, 3, true)) { return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-08-16 16:58:24
|
Revision: 2074 http://planeshift.svn.sourceforge.net/planeshift/?rev=2074&view=rev Author: mgist Date: 2008-08-16 16:58:34 +0000 (Sat, 16 Aug 2008) Log Message: ----------- - One more fix. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-08-16 16:30:51 UTC (rev 2073) +++ trunk/src/pslaunch/updaterengine.cpp 2008-08-16 16:58:34 UTC (rev 2074) @@ -842,9 +842,9 @@ } // Add version info to updaterinfo.xml and oldCvs. - csString value("<version name=\""); - value.AppendFmt("%s\" />", newCv->GetName()); - confignode->GetNode("client")->CreateNodeBefore(CS_NODE_ELEMENT)->SetValue(value); + csRef<iDocumentNode> newNode = confignode->GetNode("client")->CreateNodeBefore(CS_NODE_ELEMENT); + newNode->SetValue("version"); + newNode->SetAttribute("name", newCv->GetName()); updaterinfo->Write(vfs, UPDATERINFO_CURRENT_FILENAME); oldCvs.PushSmart(newCv); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-08-28 10:49:36
|
Revision: 2128 http://planeshift.svn.sourceforge.net/planeshift/?rev=2128&view=rev Author: mgist Date: 2008-08-28 10:49:46 +0000 (Thu, 28 Aug 2008) Log Message: ----------- - Crash fix. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-08-27 13:53:50 UTC (rev 2127) +++ trunk/src/pslaunch/updaterengine.cpp 2008-08-28 10:49:46 UTC (rev 2128) @@ -855,19 +855,22 @@ PrintOutput("Beginning integrity check!\n"); // Load current config data. + csRef<iDocumentNode> confignode csRef<iDocumentNode> root = GetRootNode(UPDATERINFO_CURRENT_FILENAME); bool success = true; - if(!root) + if(!root.IsValid()) { PrintOutput("Unable to get root node!\n"); success = false; } - - csRef<iDocumentNode> confignode = root->GetNode("config"); - if (!confignode) + else { + confignode = root->GetNode("config"); + if (!confignode.IsValid()) + { PrintOutput("Couldn't find config node in configfile!\n"); success = false; + } } if(!success) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-08-28 10:51:25
|
Revision: 2130 http://planeshift.svn.sourceforge.net/planeshift/?rev=2130&view=rev Author: mgist Date: 2008-08-28 10:51:35 +0000 (Thu, 28 Aug 2008) Log Message: ----------- - Typo Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-08-28 10:50:41 UTC (rev 2129) +++ trunk/src/pslaunch/updaterengine.cpp 2008-08-28 10:51:35 UTC (rev 2130) @@ -855,7 +855,7 @@ PrintOutput("Beginning integrity check!\n"); // Load current config data. - csRef<iDocumentNode> confignode + csRef<iDocumentNode> confignode; csRef<iDocumentNode> root = GetRootNode(UPDATERINFO_CURRENT_FILENAME); bool success = true; if(!root.IsValid()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-11-25 03:51:17
|
Revision: 2501 http://planeshift.svn.sourceforge.net/planeshift/?rev=2501&view=rev Author: mgist Date: 2008-11-25 03:51:11 +0000 (Tue, 25 Nov 2008) Log Message: ----------- - Added a check to the updater so it doesn't re-download files which are already up to date. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-11-25 00:34:45 UTC (rev 2500) +++ trunk/src/pslaunch/updaterengine.cpp 2008-11-25 03:51:11 UTC (rev 2501) @@ -713,6 +713,22 @@ csString oldFilePath = newFilePath; oldFilePath.AppendFmt(".old"); + // Start by checking whether the existing file is already up to date. + csRef<iDataBuffer> buffer = vfs->ReadFile("/this/" + newFilePath); + if(buffer) + { + csMD5::Digest md5 = csMD5::Encode(buffer->GetData(), buffer->GetSize()); + csString md5sum = md5.HexString(); + + csString fileMD5 = next->GetAttributeValue("md5sum"); + + // If it's up to date then skip this file. + if(md5sum.Compare(fileMD5)) + { + continue; + } + } + // Move old file to a temp location ready for input. fileUtil->MoveFile("/this/" + newFilePath, "/this/" + oldFilePath, true, false, true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-12-27 20:50:01
|
Revision: 2786 http://planeshift.svn.sourceforge.net/planeshift/?rev=2786&view=rev Author: mgist Date: 2008-12-27 20:49:58 +0000 (Sat, 27 Dec 2008) Log Message: ----------- - Tweaked a message on updaterinfo incompatibility. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-12-27 19:11:35 UTC (rev 2785) +++ trunk/src/pslaunch/updaterengine.cpp 2008-12-27 20:49:58 UTC (rev 2786) @@ -308,7 +308,7 @@ // There's a problem and we can't continue. Throw a boo boo and clean up. PrintOutput("\nLocal config and server config are incompatible!\n"); PrintOutput("This is caused when your local version becomes out of sync with the update mirrors.\n"); - PrintOutput("To resolve this, reinstall your client using the latest installer on the website.\n"); + PrintOutput("To resolve this, run a repair.\n"); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-02-08 12:42:05
|
Revision: 2990 http://planeshift.svn.sourceforge.net/planeshift/?rev=2990&view=rev Author: mgist Date: 2009-02-08 12:42:01 +0000 (Sun, 08 Feb 2009) Log Message: ----------- - Fixed pslaunch restart on mac. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2009-02-08 10:43:38 UTC (rev 2989) +++ trunk/src/pslaunch/updaterengine.cpp 2009-02-08 12:42:01 UTC (rev 2990) @@ -585,7 +585,7 @@ // Create a new process of the updater and exit. csString path = appName; if(fork() == 0) - execl(path.Append(".app"), path.Append(".app"), "selfUpdateSecond", NULL); + execl(path.AppendFmt(".app/Contents/MacOS/%s_static", appName), path.AppendFmt(".app/Contents/MacOS/%s_static", appName), "selfUpdateSecond", NULL); #else if(fork() == 0) execl(appName, appName, "selfUpdateSecond", NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-02-23 09:16:52
|
Revision: 3101 http://planeshift.svn.sourceforge.net/planeshift/?rev=3101&view=rev Author: mgist Date: 2009-02-23 09:16:43 +0000 (Mon, 23 Feb 2009) Log Message: ----------- - Removed extra bool. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2009-02-23 09:12:19 UTC (rev 3100) +++ trunk/src/pslaunch/updaterengine.cpp 2009-02-23 09:16:43 UTC (rev 3101) @@ -225,8 +225,7 @@ infoShare->SetUpdateNeeded(true); while(!infoShare->GetPerformUpdate()) { - bool updateNeeded = infoShare->GetUpdateNeeded(); - if(!updateNeeded || infoShare->GetExitGUI() || CheckQuit()) + if(!infoShare->GetUpdateNeeded() || infoShare->GetExitGUI() || CheckQuit()) { infoShare->Sync(); delete downloader; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-03-21 11:15:20
|
Revision: 3262 http://planeshift.svn.sourceforge.net/planeshift/?rev=3262&view=rev Author: mgist Date: 2009-03-21 11:15:17 +0000 (Sat, 21 Mar 2009) Log Message: ----------- - Fix for #2757 - PSlaunch uses 100% cpu usage. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2009-03-21 00:59:47 UTC (rev 3261) +++ trunk/src/pslaunch/updaterengine.cpp 2009-03-21 11:15:17 UTC (rev 3262) @@ -113,11 +113,12 @@ while(!infoShare->GetExitGUI()) { - if(infoShare->GetCheckIntegrity()) - { - CheckIntegrity(); - infoShare->SetCheckIntegrity(false); - } + csSleep(100); + if(infoShare->GetCheckIntegrity()) + { + CheckIntegrity(); + infoShare->SetCheckIntegrity(false); + } } } @@ -188,6 +189,8 @@ downloader = NULL; return; } + + csSleep(100); } // If we're going to self-update, close the GUI. @@ -232,6 +235,8 @@ downloader = NULL; return; } + + csSleep(100); } infoShare->Sync(); } @@ -1105,7 +1110,8 @@ infoShare->SetUpdateNeeded(true); while(infoShare->GetUpdateNeeded()) { - CHECK_QUIT + CHECK_QUIT + csSleep(100); } c = infoShare->GetPerformUpdate() ? 'y' : 'n'; infoShare->SetPerformUpdate(false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-04-19 05:27:45
|
Revision: 3502 http://planeshift.svn.sourceforge.net/planeshift/?rev=3502&view=rev Author: mgist Date: 2009-04-19 05:27:39 +0000 (Sun, 19 Apr 2009) Log Message: ----------- - Formatting improvements. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2009-04-19 05:21:01 UTC (rev 3501) +++ trunk/src/pslaunch/updaterengine.cpp 2009-04-19 05:27:39 UTC (rev 3502) @@ -694,7 +694,7 @@ if(!downloader->DownloadFile(zip, zip, false, true)) { - PrintOutput("Failed to download the update file! Try again later.\n"); + PrintOutput("\nFailed to download the update file! Try again later.\n"); return; } @@ -702,7 +702,7 @@ csRef<iDataBuffer> buffer = vfs->ReadFile("/this/" + zip, true); if (!buffer) { - PrintOutput("Could not get MD5 of updater zip!!\n"); + PrintOutput("\nCould not get MD5 of updater zip!!\n"); return; } @@ -712,7 +712,7 @@ if(!md5sum.Compare(newCv->GetMD5Sum())) { - PrintOutput("md5sum of client zip does not match correct md5sum!!\n"); + PrintOutput("\nmd5sum of client zip does not match correct md5sum!!\n"); return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-04-20 20:04:41
|
Revision: 3515 http://planeshift.svn.sourceforge.net/planeshift/?rev=3515&view=rev Author: mgist Date: 2009-04-20 20:04:26 +0000 (Mon, 20 Apr 2009) Log Message: ----------- - Tweak permissions check so admin isn't required when running pslaunch in a user controlled folder. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2009-04-20 18:14:42 UTC (rev 3514) +++ trunk/src/pslaunch/updaterengine.cpp 2009-04-20 20:04:26 UTC (rev 3515) @@ -165,7 +165,8 @@ // Check if we have write permissions. #ifdef _WIN32 - if(!IsUserAnAdmin()) + // TODO: Improve this. + if(!IsUserAnAdmin() && !log.IsValid()) #else if(!log.IsValid()) #endif @@ -1225,7 +1226,8 @@ { // Check if we have write permissions. #ifdef _WIN32 - if(!IsUserAnAdmin()) + // TODO: Improve this. + if(!IsUserAnAdmin() && !log.IsValid()) #else if(!log.IsValid()) #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-04-21 23:54:13
|
Revision: 3521 http://planeshift.svn.sourceforge.net/planeshift/?rev=3521&view=rev Author: mgist Date: 2009-04-21 23:54:02 +0000 (Tue, 21 Apr 2009) Log Message: ----------- - Enhanced the updater to check if an update actually applies to the platform. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2009-04-21 22:48:05 UTC (rev 3520) +++ trunk/src/pslaunch/updaterengine.cpp 2009-04-21 23:54:02 UTC (rev 3521) @@ -259,7 +259,7 @@ else { // Mark no updates needed. - printf("\nNo updates needed!\n"); + printf("No updates needed!\n"); if(hasGUI) { infoShare->SetUpdateNeeded(false); @@ -323,15 +323,16 @@ const csRefArray<ClientVersion>& oldCvs = config->GetCurrentConfig()->GetClientVersions(); const csRefArray<ClientVersion>& newCvs = config->GetNewConfig()->GetClientVersions(); + size_t oldSize = oldCvs.GetSize(); size_t newSize = newCvs.GetSize(); // Old is bigger than the new (out of sync), or same size. - if(oldCvs.GetSize() >= newSize) + if(oldSize >= newSize) { // If both are empty then skip the extra name check! if(newSize != 0) { - bool outOfSync = oldCvs.GetSize() > newSize; + bool outOfSync = oldSize > newSize; if(!outOfSync) { @@ -361,8 +362,16 @@ return false; } - // New is bigger than the old, so there's updates. - return true; + // Check for updates concerning this platform. + for(size_t i=oldSize; i<newSize; ++i) + { + ClientVersion* cv = newCvs[i]; + if(strcmp(cv->GetMD5Sum(), "") || strcmp(cv->GetGenericMD5Sum(), "")) + return true; + } + + // No updates related to this platform are available. + return false; } csRef<iDocumentNode> UpdaterEngine::GetRootNode(const char* nodeName, csRef<iDocument>* document) @@ -673,8 +682,12 @@ */ for(int pass=1; pass<=2; ++pass) { + // Check that this update is relevent to this platform. + if(pass == 1 && !strcmp(newCv->GetMD5Sum(), "")) + continue; + // Only do second pass if the platform isn't 'generic'. - if(pass == 2 && genericPlatform) + if(pass == 2 && (genericPlatform || !strcmp(newCv->GetGenericMD5Sum(), ""))) break; // Construct zip name. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-04-24 19:15:06
|
Revision: 3547 http://planeshift.svn.sourceforge.net/planeshift/?rev=3547&view=rev Author: mgist Date: 2009-04-24 19:14:49 +0000 (Fri, 24 Apr 2009) Log Message: ----------- - Fixed repair to not overwrite app config files when only checking data. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2009-04-24 18:43:36 UTC (rev 3546) +++ trunk/src/pslaunch/updaterengine.cpp 2009-04-24 19:14:49 UTC (rev 3547) @@ -1108,7 +1108,7 @@ { // File is genuinely missing. if(platform.Compare(config->GetCurrentConfig()->GetPlatform()) || - platform.Compare("all")) + platform.Compare("cfg") || platform.Compare("all")) { failed.Push(node); #ifdef CS_PLATFORM_UNIX @@ -1122,7 +1122,7 @@ csString md5s = md5.HexString(); if((platform.Compare(config->GetCurrentConfig()->GetPlatform()) || - platform.Compare("all")) && !md5s.Compare(md5sum)) + platform.Compare("cfg") || platform.Compare("all")) && !md5s.Compare(md5sum)) { failed.Push(node); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-05-12 19:08:16
|
Revision: 3669 http://planeshift.svn.sourceforge.net/planeshift/?rev=3669&view=rev Author: Khakilord Date: 2009-05-12 19:08:06 +0000 (Tue, 12 May 2009) Log Message: ----------- Fixed crash in pslaunch on mac Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2009-05-12 01:07:47 UTC (rev 3668) +++ trunk/src/pslaunch/updaterengine.cpp 2009-05-12 19:08:06 UTC (rev 3669) @@ -626,7 +626,7 @@ // Create a new process of the updater and exit. csString path = appName; if(fork() == 0) - execl(path.AppendFmt(".app/Contents/MacOS/%s_static", appName), path.AppendFmt(".app/Contents/MacOS/%s_static", appName), "selfUpdateSecond", NULL); + execl(path.AppendFmt(".app/Contents/MacOS/%s_static", appName.GetData()), path.AppendFmt(".app/Contents/MacOS/%s_static", appName.GetData()), "selfUpdateSecond", NULL); #else if(fork() == 0) execl(appName, appName, "selfUpdateSecond", NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-27 13:41:52
|
Revision: 4562 http://planeshift.svn.sourceforge.net/planeshift/?rev=4562&view=rev Author: mgist Date: 2009-09-27 13:41:45 +0000 (Sun, 27 Sep 2009) Log Message: ----------- - Add some \n Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2009-09-27 12:02:29 UTC (rev 4561) +++ trunk/src/pslaunch/updaterengine.cpp 2009-09-27 13:41:45 UTC (rev 4562) @@ -717,10 +717,12 @@ // Download update zip. if(pass == 1 && !genericPlatform) { + PrintOutput("\n"); PrintOutput("Downloading platform specific update file..\n\n"); } else { + PrintOutput("\n"); PrintOutput("Downloading generic update file..\n\n"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-28 18:49:33
|
Revision: 4584 http://planeshift.svn.sourceforge.net/planeshift/?rev=4584&view=rev Author: mgist Date: 2009-09-28 18:49:25 +0000 (Mon, 28 Sep 2009) Log Message: ----------- - Comment out line breaks for now.. they cause crashes. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2009-09-28 18:03:10 UTC (rev 4583) +++ trunk/src/pslaunch/updaterengine.cpp 2009-09-28 18:49:25 UTC (rev 4584) @@ -717,12 +717,12 @@ // Download update zip. if(pass == 1 && !genericPlatform) { - PrintOutput("\n"); + /*PrintOutput("\n");*/ PrintOutput("Downloading platform specific update file..\n\n"); } else { - PrintOutput("\n"); + /*PrintOutput("\n");*/ PrintOutput("Downloading generic update file..\n\n"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-10-01 14:35:53
|
Revision: 4592 http://planeshift.svn.sourceforge.net/planeshift/?rev=4592&view=rev Author: mgist Date: 2009-10-01 14:35:20 +0000 (Thu, 01 Oct 2009) Log Message: ----------- - Improved output a little. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2009-10-01 07:30:00 UTC (rev 4591) +++ trunk/src/pslaunch/updaterengine.cpp 2009-10-01 14:35:20 UTC (rev 4592) @@ -1146,20 +1146,24 @@ size_t failedSize = failed.GetSize(); if(failedSize == 0) { - PrintOutput("\nAll files passed the check!\n"); + if(!accepted) + { + PrintOutput("\nAll files passed the check!\n"); + } } else { - PrintOutput("\nThe following files failed the check:\n\n"); - for(size_t i=0; i<failedSize; i++) - { - PrintOutput("%s\n", failed.Get(i)->GetAttributeValue("path")); - } - char c = ' '; - PrintOutput("\nDo you wish to download the correct copies of these files? (y/n)\n"); if(!accepted) { + PrintOutput("\nThe following files failed the check:\n\n"); + for(size_t i=0; i<failedSize; i++) + { + PrintOutput("%s\n", failed.Get(i)->GetAttributeValue("path")); + } + + PrintOutput("\nDo you wish to download the correct copies of these files? (y/n)\n"); + if(!hasGUI) { while(c != 'y' && c != 'n') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-10-20 19:11:56
|
Revision: 4668 http://planeshift.svn.sourceforge.net/planeshift/?rev=4668&view=rev Author: mgist Date: 2009-10-20 19:11:43 +0000 (Tue, 20 Oct 2009) Log Message: ----------- - Fixed mirror switch url bug. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2009-10-20 03:20:51 UTC (rev 4667) +++ trunk/src/pslaunch/updaterengine.cpp 2009-10-20 19:11:43 UTC (rev 4668) @@ -1311,16 +1311,13 @@ downloader->SetProxy(config->GetProxy().host.GetData(), config->GetProxy().port); // Download new xml file. - if(!downloader->DownloadFile(config->GetNewMirrorAddress(), xmlPath, true, true, 3, true)) + csString xmlAddress; + xmlAddress.Format("%s/updaterinfo.xml", config->GetNewMirrorAddress()); + if(!downloader->DownloadFile(xmlAddress, xmlPath, true, true, 3, true)) { - csString xmlAddress; - xmlAddress.Format("%s/updaterinfo.xml", config->GetNewMirrorAddress()); - if(!downloader->DownloadFile(xmlAddress, xmlPath, true, true, 3, true)) - { - printf("Failed to download updaterinfo from new mirror.\n"); - fileUtil->MoveFile(xmlBakPath, xmlPath, true, false, true); - return false; - } + printf("Failed to download updaterinfo from new mirror.\n"); + fileUtil->MoveFile(xmlBakPath, xmlPath, true, false, true); + return false; } fileUtil->RemoveFile(xmlBakPath, true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2010-01-11 01:27:37
|
Revision: 5228 http://planeshift.svn.sourceforge.net/planeshift/?rev=5228&view=rev Author: mgist Date: 2010-01-11 00:14:07 +0000 (Mon, 11 Jan 2010) Log Message: ----------- - Worked around broken line breaks in paws multiline box for pslaunch. - Fixed pslaunch.exe showing up when doing a repair on windows. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2010-01-10 23:49:24 UTC (rev 5227) +++ trunk/src/pslaunch/updaterengine.cpp 2010-01-11 00:14:07 UTC (rev 5228) @@ -953,7 +953,7 @@ } else { - PrintOutput("Beginning integrity check!\n"); + PrintOutput("Beginning integrity check!\n\n"); } // Load current config data. @@ -1054,6 +1054,7 @@ } // Initialise downloader. + PrintOutput("\n\nDownloading integrity data."); downloader = new Downloader(vfs, config); // Set proxy @@ -1105,6 +1106,7 @@ void UpdaterEngine::CheckMD5s(iDocumentNode* md5sums, csString& baseurl, bool accepted) { + PrintOutput("\n\nChecking file integrity:"); csRefArray<iDocumentNode> failed; csArray<bool> updateinside; #ifdef CS_PLATFORM_UNIX @@ -1144,7 +1146,8 @@ csString md5s = md5.HexString(); if((platform.Compare(config->GetCurrentConfig()->GetPlatform()) || - platform.Compare("cfg") || platform.Compare("all")) && !md5s.Compare(md5sum)) + platform.Compare("cfg") || platform.Compare("all")) && !md5s.Compare(md5sum) && + path != (appName + ".exe")) { failed.Push(node); updateinside.Push(config->RepairingInZip() && node->GetAttributeValueAsBool("checkonly")); @@ -1164,10 +1167,10 @@ char c = ' '; if(!accepted) { - PrintOutput("\nThe following files failed the check:\n\n"); + PrintOutput("\nThe following files failed the check:\n"); for(size_t i=0; i<failedSize; i++) { - PrintOutput("%s\n", failed.Get(i)->GetAttributeValue("path")); + PrintOutput("\n%s", failed.Get(i)->GetAttributeValue("path")); } PrintOutput("\nDo you wish to download the correct copies of these files? (y/n)\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2010-01-13 20:10:15
|
Revision: 5271 http://planeshift.svn.sourceforge.net/planeshift/?rev=5271&view=rev Author: mgist Date: 2010-01-13 20:10:09 +0000 (Wed, 13 Jan 2010) Log Message: ----------- - Fixed some bugs in the updater self-update. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2010-01-13 19:14:54 UTC (rev 5270) +++ trunk/src/pslaunch/updaterengine.cpp 2010-01-13 20:10:09 UTC (rev 5271) @@ -195,13 +195,19 @@ csSleep(100); } + infoShare->Sync(); + } + + // Begin the self update process. + SelfUpdate(false); + + if(hasGUI) + { // If we're going to self-update, close the GUI. infoShare->SetExitGUI(true); infoShare->Sync(); } - // Begin the self update process. - SelfUpdate(false); return; } @@ -214,7 +220,8 @@ // Check if we have write permissions. #ifdef _WIN32 - if(!IsUserAnAdmin()) + // TODO: Improve this. + if(!IsUserAnAdmin() && !log.IsValid()) #else if(!log.IsValid()) #endif @@ -447,16 +454,17 @@ PrintOutput("Copying new files!\n"); // Construct executable names. - csString tempName = appName; - appName.AppendFmt(".exe"); - tempName.AppendFmt("2.exe"); + csString realName = appName; + csString dupeName = appName; + realName.Append(".exe"); + dupeName.Append("2.exe"); // Delete the old updater file and copy the new in place. - while(!fileUtil->RemoveFile("/this/" + appName)) + while(!fileUtil->RemoveFile("/this/" + realName)) { csSleep(50); } - fileUtil->CopyFile("/this/" + tempName, "/this/" + appName, true, true); + fileUtil->CopyFile("/this/" + dupeName, "/this/" + realName, true, true); // Copy any art and data. if(hasGUI) @@ -471,23 +479,23 @@ csString artPath = "/art/"; artPath.AppendFmt("%s.zip", appName.GetData()); - fileUtil->CopyFile("/zip" + artPath, artPath, true, false, true); + fileUtil->CopyFile("/zip" + artPath, "/this/" + artPath, true, false, true); csString dataPath = "/data/gui/"; dataPath.AppendFmt("%s.xml", appName.GetData()); - fileUtil->CopyFile("/zip" + dataPath, dataPath, true, false, true); + fileUtil->CopyFile("/zip" + dataPath, "/this/" + dataPath, true, false, true); vfs->Unmount("/zip", realZipPath->GetData()); } // Create a new process of the updater. - CreateProcess(appName.GetData(), "selfUpdateSecond", 0, 0, false, CREATE_DEFAULT_ERROR_MODE, 0, 0, &siStartupInfo, &piProcessInfo); + CreateProcess(realName.GetData(), "selfUpdateSecond", 0, 0, false, CREATE_DEFAULT_ERROR_MODE, 0, 0, &siStartupInfo, &piProcessInfo); return true; } case 2: // We're now running the new updater in the correct location. { // Clean up left over files. - PrintOutput("\nCleaning up!\n"); + PrintOutput("\nCleaning up!\n\n"); // Construct zip name. csString zip = appName; @@ -570,7 +578,7 @@ case 2: // We're now running the new updater in the correct location. { // Clean up left over files. - PrintOutput("\nCleaning up!\n"); + PrintOutput("\nCleaning up!\n\n"); // Construct zip name. csString zip = appName; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2010-01-26 19:42:31
|
Revision: 5393 http://planeshift.svn.sourceforge.net/planeshift/?rev=5393&view=rev Author: mgist Date: 2010-01-26 19:42:22 +0000 (Tue, 26 Jan 2010) Log Message: ----------- - Fix for #3979. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2010-01-26 16:47:49 UTC (rev 5392) +++ trunk/src/pslaunch/updaterengine.cpp 2010-01-26 19:42:22 UTC (rev 5393) @@ -983,6 +983,13 @@ } } + // Load updater config + if (!config->GetCurrentConfig()->Initialize(confignode)) + { + printf("Failed to Initialize mirror config current!\n"); + success = false; + } + if(!success) { // Check if we have write permissions. @@ -996,7 +1003,7 @@ fileUtil->RemoveFile("/this/updaterinfo.xml", true); downloader = new Downloader(vfs); downloader->SetProxy(config->GetProxy().host.GetData(), config->GetProxy().port); - if(!downloader->DownloadFile("http://www.psmirror.org/repo/updaterinfo.xml", UPDATERINFO_CURRENT_FILENAME, true, true, 3, true)) + if(!downloader->DownloadFile("http://testing.xordan.com/updaterinfo.xml", UPDATERINFO_CURRENT_FILENAME, true, true, 3, true)) { PrintOutput("\nFailed to download updater info!\n"); return; @@ -1017,13 +1024,13 @@ printf("Couldn't find config node in configfile!\n"); return; } - } - // Load updater config - if (!config->GetCurrentConfig()->Initialize(confignode)) - { - printf("Failed to Initialize mirror config current!\n"); - return; + // Load updater config + if (!config->GetCurrentConfig()->Initialize(confignode)) + { + printf("Failed to Initialize mirror config current!\n"); + return; + } } // Initialise downloader. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2010-02-11 22:00:59
|
Revision: 5520 http://planeshift.svn.sourceforge.net/planeshift/?rev=5520&view=rev Author: mgist Date: 2010-02-11 22:00:52 +0000 (Thu, 11 Feb 2010) Log Message: ----------- - Use updater server mirror list over the local one. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2010-02-11 21:41:24 UTC (rev 5519) +++ trunk/src/pslaunch/updaterengine.cpp 2010-02-11 22:00:52 UTC (rev 5520) @@ -315,6 +315,13 @@ return false; } + // Check if we need to update the mirrors. + // TODO: Actually update the local list. + if(config->GetNewConfig()->GetMirrors().GetSize() != 0) + { + config->GetCurrentConfig()->GetMirrors() = config->GetNewConfig()->GetMirrors(); + } + // Compare Versions. return(config->UpdatePlatform() && (config->GetNewConfig()->GetUpdaterVersionLatest() - UPDATER_VERSION > 0.01)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-12-02 18:49:51
|
Revision: 6469 http://planeshift.svn.sourceforge.net/planeshift/?rev=6469&view=rev Author: rlydontknow Date: 2010-12-02 18:49:45 +0000 (Thu, 02 Dec 2010) Log Message: ----------- skip the "old md5" check if the old checksum isn't available Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2010-12-02 16:56:06 UTC (rev 6468) +++ trunk/src/pslaunch/updaterengine.cpp 2010-12-02 18:49:45 UTC (rev 6469) @@ -911,7 +911,7 @@ { continue; } - else if(!md5sum.Compare(oldMD5)) + else if(!oldMD5.IsEmpty() && !md5sum.Compare(oldMD5)) { PrintOutput("Skipping file %s because it has been modified - you may want to repair.\n", newFilePath.GetData()); continue; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-12-16 14:05:58
|
Revision: 6542 http://planeshift.svn.sourceforge.net/planeshift/?rev=6542&view=rev Author: rlydontknow Date: 2010-12-16 14:05:52 +0000 (Thu, 16 Dec 2010) Log Message: ----------- properly construct the launcher path on mac Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2010-12-16 14:05:19 UTC (rev 6541) +++ trunk/src/pslaunch/updaterengine.cpp 2010-12-16 14:05:52 UTC (rev 6542) @@ -713,16 +713,14 @@ printf("system(%s) failed!\n", cmd.GetData()); } -#if defined(CS_PLATFORM_MACOSX) - // Create a new process of the updater and exit. csString path = appName; - if(fork() == 0) - execl(path.AppendFmt(".app/Contents/MacOS/%s_static", appName.GetData()), path.AppendFmt(".app/Contents/MacOS/%s_static", appName.GetData()), "selfUpdateSecond", NULL); -#else - if(fork() == 0) - execl(appName, appName, "selfUpdateSecond", NULL); +#if defined(CS_PLATFORM_MAXOSX) + path.AppendFmt(".app/Contents/MacOS/%s_static", appName.GetData()); #endif + if(fork() == 0) + execl(path, path, "selfUpdateSecond", NULL); + GetConfig()->SetSelfUpdating(true); return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |