From: <mg...@us...> - 2007-10-27 12:40:40
|
Revision: 126 http://planeshift.svn.sourceforge.net/planeshift/?rev=126&view=rev Author: mgist Date: 2007-10-27 05:40:44 -0700 (Sat, 27 Oct 2007) Log Message: ----------- - Bypass user confirm for psupdater, at least for now. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2007-10-27 12:32:45 UTC (rev 125) +++ trunk/src/pslaunch/updaterengine.cpp 2007-10-27 12:40:44 UTC (rev 126) @@ -123,14 +123,17 @@ { printOutput("Update Available!\n"); // If using a GUI, prompt user whether or not to update. - *updateNeeded = true; - while(!*performUpdate) + if(!appName.Compare("psupdater")) { - if(!*updateNeeded) + *updateNeeded = true; + while(!*performUpdate) { - delete downloader; - downloader = NULL; - return; + if(!*updateNeeded) + { + delete downloader; + downloader = NULL; + return; + } } } @@ -155,14 +158,17 @@ config->GetConfigFile()->Save(); // If using a GUI, prompt user whether or not to update. - *updateNeeded = true; - while(!*performUpdate) + if(!appName.Compare("psupdater")) { - if(!*updateNeeded) + *updateNeeded = true; + while(!*performUpdate) { - delete downloader; - downloader = NULL; - return; + if(!*updateNeeded) + { + delete downloader; + downloader = NULL; + return; + } } } @@ -186,7 +192,7 @@ // Backup old config, download new. fileUtil->CopyFile("updaterinfo.xml", "updaterinfo.xml.bak", false, false); fileUtil->RemoveFile("updaterinfo.xml"); - downloader->DownloadFile("updaterinfo.xml", "updaterinfo.xml"); + downloader->DownloadFile("updaterinfo.xml", "updaterinfo.xml", false); // Load new config data. csRef<iDocumentNode> root = GetRootNode(UPDATERINFO_FILENAME); @@ -350,7 +356,7 @@ zip.AppendFmt(".zip"); // Download new updater file. - downloader->DownloadFile(zip, zip); + downloader->DownloadFile(zip, zip, false); // Check md5sum is correct. csRef<iDataBuffer> buffer = vfs->ReadFile("/this/" + zip, true); @@ -516,7 +522,7 @@ zip.AppendFmt(".zip"); // Download update zip. - downloader->DownloadFile(zip, zip); + downloader->DownloadFile(zip, zip, false); // Check md5sum is correct. csRef<iDataBuffer> buffer = vfs->ReadFile("/this/" + zip, true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2007-10-27 12:47:01
|
Revision: 128 http://planeshift.svn.sourceforge.net/planeshift/?rev=128&view=rev Author: mgist Date: 2007-10-27 05:47:05 -0700 (Sat, 27 Oct 2007) Log Message: ----------- - Compile fix for non-VC. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2007-10-27 12:43:08 UTC (rev 127) +++ trunk/src/pslaunch/updaterengine.cpp 2007-10-27 12:47:05 UTC (rev 128) @@ -446,7 +446,7 @@ zip.AppendFmt(".zip"); // Download new updater file. - downloader->DownloadFile(zip, zip); + downloader->DownloadFile(zip, zip, false); // Check md5sum is correct. csRef<iDataBuffer> buffer = vfs->ReadFile("/this/" + zip, true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2007-11-10 19:57:19
|
Revision: 239 http://planeshift.svn.sourceforge.net/planeshift/?rev=239&view=rev Author: mgist Date: 2007-11-10 11:57:17 -0800 (Sat, 10 Nov 2007) Log Message: ----------- - Fixed updater attempting to update on launcher quit if an update is available. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2007-11-10 19:29:16 UTC (rev 238) +++ trunk/src/pslaunch/updaterengine.cpp 2007-11-10 19:57:17 UTC (rev 239) @@ -143,7 +143,7 @@ if(!appName.Compare("psupdater")) { *updateNeeded = true; - while(*performUpdate == false && *exitGUI == false) + while(*performUpdate == false || *exitGUI == false) { // Make sure we die if we exit the gui as well. if(*updateNeeded == false || *exitGUI == true ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2007-12-03 00:43:23
|
Revision: 348 http://planeshift.svn.sourceforge.net/planeshift/?rev=348&view=rev Author: mgist Date: 2007-12-02 16:43:26 -0800 (Sun, 02 Dec 2007) Log Message: ----------- - Backup should be in a subdir. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2007-12-02 23:16:29 UTC (rev 347) +++ trunk/src/pslaunch/updaterengine.cpp 2007-12-03 00:43:26 UTC (rev 348) @@ -658,6 +658,7 @@ // Get the 'backup' mirror, should always be the first in the list. csString url = config->GetNewConfig()->GetMirror(0)->GetBaseURL(); + url.Append("backup/"); // Try path from base URL. if(!downloader->DownloadFile(url.Append(newFilePath.GetData()), newFilePath.GetData(), true)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-29 17:41:40
|
Revision: 1031 http://planeshift.svn.sourceforge.net/planeshift/?rev=1031&view=rev Author: mgist Date: 2008-02-29 09:41:41 -0800 (Fri, 29 Feb 2008) Log Message: ----------- - Fix self updating, got broken by a bad commit. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-29 17:26:14 UTC (rev 1030) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-29 17:41:41 UTC (rev 1031) @@ -163,7 +163,7 @@ printOutput("Checking for updates to the updater: "); - if(checkUpdater() && config->UpdateExecs()) + if(checkUpdater()) { printOutput("Update Available!\n"); @@ -275,7 +275,7 @@ } // Compare Versions. - return(!config->UpdateExecs() && config->GetNewConfig()->GetUpdaterVersionLatest() > UPDATER_VERSION); + return(config->UpdateExecs() && config->GetNewConfig()->GetUpdaterVersionLatest() > UPDATER_VERSION); } bool UpdaterEngine::checkGeneral() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-03-02 05:48:44
|
Revision: 1099 http://planeshift.svn.sourceforge.net/planeshift/?rev=1099&view=rev Author: mgist Date: 2008-03-01 21:48:47 -0800 (Sat, 01 Mar 2008) Log Message: ----------- - Revert last change. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-03-02 05:24:38 UTC (rev 1098) +++ trunk/src/pslaunch/updaterengine.cpp 2008-03-02 05:48:47 UTC (rev 1099) @@ -586,7 +586,8 @@ cmd.Format("%s%s.app/Contents/MacOS/%s_static selfUpdateSecond", thisPath->GetData(), appName.GetData(), appName.GetData()); system(cmd); #else - execl(appName, appName, "selfUpdateSecond", NULL); + if(fork() == 0) + execl(appName, appName, "selfUpdateSecond", NULL); #endif return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-06-03 01:32:58
|
Revision: 1680 http://planeshift.svn.sourceforge.net/planeshift/?rev=1680&view=rev Author: mgist Date: 2008-06-02 18:33:06 -0700 (Mon, 02 Jun 2008) Log Message: ----------- - Improved the platform specific file case in integrity check. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-06-03 00:42:04 UTC (rev 1679) +++ trunk/src/pslaunch/updaterengine.cpp 2008-06-03 01:33:06 UTC (rev 1680) @@ -942,13 +942,14 @@ csString path = node->GetAttributeValue("path"); csString md5sum = node->GetAttributeValue("md5sum"); - bool specific = node->GetAttributeValueAsBool("specific"); + csString platform = node->GetAttributeValue("platform"); csRef<iDataBuffer> buffer = vfs->ReadFile("/this/" + path); if(!buffer) { // File is genuinely missing. - if(!specific) + if(platform.Compare(config->GetCurrentConfig()->GetPlatform()) || + platform.Compare("all")) { failed.Push(node); } @@ -991,11 +992,13 @@ csString downloadpath("/this/"); downloadpath.Append(failed.Get(i)->GetAttributeValue("path")); fileUtil->RemoveFile(downloadpath, true); - if(!downloader->DownloadFile(baseurl + failed.Get(i)->GetAttributeValue("path"), downloadpath, true, true)) + if(!downloader->DownloadFile(baseurl + failed.Get(i)->GetAttributeValue("path"), + failed.Get(i)->GetAttributeValue("path"), true, true)) { // Maybe it's in a platform specific subdirectory. Try that next. - csString url = baseurl + config->GetNewConfig()->GetPlatform() + "/"; - downloader->DownloadFile(url + failed.Get(i)->GetAttributeValue("path"), downloadpath, true, true); + csString url = baseurl + config->GetCurrentConfig()->GetPlatform() + "/"; + downloader->DownloadFile(url + failed.Get(i)->GetAttributeValue("path"), + failed.Get(i)->GetAttributeValue("path"), true, true); } } PrintOutput("Done!\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-06-10 20:03:16
|
Revision: 1712 http://planeshift.svn.sourceforge.net/planeshift/?rev=1712&view=rev Author: mgist Date: 2008-06-10 13:03:25 -0700 (Tue, 10 Jun 2008) Log Message: ----------- - Damn >> Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-06-10 19:59:41 UTC (rev 1711) +++ trunk/src/pslaunch/updaterengine.cpp 2008-06-10 20:03:25 UTC (rev 1712) @@ -927,7 +927,7 @@ { csRefArray<iDocumentNode> failed; #ifdef CS_PLATFORM_UNIX - csHash<bool, csRef<iDocumentNode>> failedExec; + csHash<bool, csRef<iDocumentNode> > failedExec; #endif csRef<iDocumentNodeIterator> md5nodes = md5sums->GetNodes("md5sum"); while(md5nodes->HasNext()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2007-12-03 03:24:55
|
Revision: 350 http://planeshift.svn.sourceforge.net/planeshift/?rev=350&view=rev Author: mgist Date: 2007-12-02 19:24:59 -0800 (Sun, 02 Dec 2007) Log Message: ----------- - Naming tweak. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2007-12-03 01:24:43 UTC (rev 349) +++ trunk/src/pslaunch/updaterengine.cpp 2007-12-03 03:24:59 UTC (rev 350) @@ -552,8 +552,7 @@ // Construct zip name. csString zip = config->GetCurrentConfig()->GetPlatform(); - zip.AppendFmt(newCv->GetName()); - zip.AppendFmt(".zip"); + zip.AppendFmt("-%s.zip", newCv->GetName().GetData()); // Download update zip. downloader->DownloadFile(zip, zip, false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2007-12-06 04:44:25
|
Revision: 376 http://planeshift.svn.sourceforge.net/planeshift/?rev=376&view=rev Author: mgist Date: 2007-12-05 20:44:30 -0800 (Wed, 05 Dec 2007) Log Message: ----------- - Another updater fix. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2007-12-06 03:55:16 UTC (rev 375) +++ trunk/src/pslaunch/updaterengine.cpp 2007-12-06 04:44:30 UTC (rev 376) @@ -665,13 +665,15 @@ printOutput("Attempting to download full version of %s\n", newFilePath.GetData()); // Get the 'backup' mirror, should always be the first in the list. - csString url = config->GetNewConfig()->GetMirror(0)->GetBaseURL(); - url.Append("backup/"); + csString baseurl = config->GetNewConfig()->GetMirror(0)->GetBaseURL(); + baseurl.Append("backup/"); // Try path from base URL. + csString url = baseurl; if(!downloader->DownloadFile(url.Append(newFilePath.GetData()), newFilePath.GetData(), true)) { // Maybe it's in a platform specific subdirectory. Try that next. + url = baseurl; url.Append(config->GetNewConfig()->GetPlatform()); if(downloader->DownloadFile(url.Append(newFilePath.GetData()), newFilePath.GetData(), true)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-01-05 23:21:51
|
Revision: 623 http://planeshift.svn.sourceforge.net/planeshift/?rev=623&view=rev Author: mgist Date: 2008-01-05 15:21:56 -0800 (Sat, 05 Jan 2008) Log Message: ----------- - Warnings. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-01-05 22:34:35 UTC (rev 622) +++ trunk/src/pslaunch/updaterengine.cpp 2008-01-05 23:21:56 UTC (rev 623) @@ -515,7 +515,7 @@ #endif // Remove old updater. csString cmd = ""; - cmd.AppendFmt("rm -Rf %s", realName); + cmd.AppendFmt("rm -Rf %s", realName.GetData()); system(cmd.GetData()); // Copy new one into place. @@ -529,7 +529,7 @@ // Create a new process of the updater and exit. #if defined(CS_PLATFORM_MACOSX) cmd.Clear(); - cmd.AppendFmt("open -a ./%s selfUpdateSecond", realName); + cmd.AppendFmt("open -a ./%s selfUpdateSecond", realName.GetData()); system(cmd); #else if(fork() == 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2008-02-12 18:10:06
|
Revision: 794 http://planeshift.svn.sourceforge.net/planeshift/?rev=794&view=rev Author: magodra Date: 2008-02-12 10:10:08 -0800 (Tue, 12 Feb 2008) Log Message: ----------- - Changed so that this file compile on linux. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-12 15:37:21 UTC (rev 793) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-12 18:10:08 UTC (rev 794) @@ -530,7 +530,7 @@ realName.Append(".bin"); #endif // Remove old updater. - csString cmd.Clear(); + csString cmd; cmd.AppendFmt("rm -Rf %s", realName.GetData()); system(cmd.GetData()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-16 06:41:09
|
Revision: 826 http://planeshift.svn.sourceforge.net/planeshift/?rev=826&view=rev Author: mgist Date: 2008-02-15 22:41:14 -0800 (Fri, 15 Feb 2008) Log Message: ----------- - Extract real zip path from vfs path. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-16 06:36:46 UTC (rev 825) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-16 06:41:14 UTC (rev 826) @@ -612,8 +612,10 @@ return; } + csRef<iDataBuffer> realZipPath = vfs->GetRealPath("/this/" + zip); + // Mount zip - vfs->Mount("/zip", zip); + vfs->Mount("/zip", realZipPath->GetData()); // Parse deleted files xml, make a list. csArray<csString> deletedList; @@ -751,7 +753,7 @@ } // Unmount zip and delete. - if(vfs->Unmount("/zip", zip)) + if(vfs->Unmount("/zip", realZipPath->GetData())) { vfs->Sync(); fileUtil->RemoveFile("/this/" + zip); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-16 06:44:18
|
Revision: 827 http://planeshift.svn.sourceforge.net/planeshift/?rev=827&view=rev Author: mgist Date: 2008-02-15 22:44:21 -0800 (Fri, 15 Feb 2008) Log Message: ----------- - Extract real zip path from vfs path. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-16 06:41:14 UTC (rev 826) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-16 06:44:21 UTC (rev 827) @@ -517,12 +517,14 @@ return false; } - // Mount zip. - vfs->Mount("/zip", zip); + csRef<iDataBuffer> realZipPath = vfs->GetRealPath("/this/" + zip); + // Mount zip + vfs->Mount("/zip", realZipPath->GetData()); + csString realName = appName; #if defined(CS_PLATFORM_MACOSX) - realName.Append(".dmg"); + realName.Append(".app"); #else realName.Append(".bin"); #endif @@ -537,7 +539,7 @@ system(cmd.GetData()); // Unmount zip. - vfs->Unmount("/zip", zip); + vfs->Unmount("/zip", realZipPath->GetData()) // Create a new process of the updater and exit. #if defined(CS_PLATFORM_MACOSX) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-16 06:46:11
|
Revision: 828 http://planeshift.svn.sourceforge.net/planeshift/?rev=828&view=rev Author: mgist Date: 2008-02-15 22:46:16 -0800 (Fri, 15 Feb 2008) Log Message: ----------- - Compile fix. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-16 06:44:21 UTC (rev 827) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-16 06:46:16 UTC (rev 828) @@ -539,7 +539,7 @@ system(cmd.GetData()); // Unmount zip. - vfs->Unmount("/zip", realZipPath->GetData()) + vfs->Unmount("/zip", realZipPath->GetData()); // Create a new process of the updater and exit. #if defined(CS_PLATFORM_MACOSX) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-16 07:43:01
|
Revision: 830 http://planeshift.svn.sourceforge.net/planeshift/?rev=830&view=rev Author: mgist Date: 2008-02-15 23:43:07 -0800 (Fri, 15 Feb 2008) Log Message: ----------- - More vfs/real path fixes. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-16 07:08:22 UTC (rev 829) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-16 07:43:07 UTC (rev 830) @@ -694,9 +694,12 @@ // Binary patch. printOutput("Patching file %s: ", newFilePath.GetData()); - if(!PatchFile(oldFilePath, diff, newFilePath)) + csRef<iDataBuffer> oldFP = vfs->GetRealPath("/this/" + oldFilePath); + csRef<iDataBuffer> diffFP = vfs->GetRealPath("/this/" + diff); + csRef<iDataBuffer> newFP = vfs->GetRealPath("/this/" + newFilePath); + if(!PatchFile(oldFP->GetData(), diffFP->GetData(), newFP->GetData())) { - printOutput("Failed!\r\n"); + printOutput("Failed!\n"); printOutput("Attempting to download full version of %s: ", newFilePath.GetData()); // Get the 'backup' mirror, should always be the first in the list. @@ -750,9 +753,9 @@ else printOutput("Success!\r\n"); } - // Clean up temp files. - fileUtil->RemoveFile("/this/" + oldFilePath); - } + } + // Clean up temp files. + fileUtil->RemoveFile("/this/" + oldFilePath); fileUtil->RemoveFile("/this/" + diff, false); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-16 07:45:34
|
Revision: 831 http://planeshift.svn.sourceforge.net/planeshift/?rev=831&view=rev Author: mgist Date: 2008-02-15 23:45:40 -0800 (Fri, 15 Feb 2008) Log Message: ----------- - Fixed weird \r introduction.. o.0 Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-16 07:43:07 UTC (rev 830) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-16 07:45:40 UTC (rev 831) @@ -57,7 +57,7 @@ vfs = csQueryRegistry<iVFS> (object_reg); if(!vfs) { - printf("No VFS!\r\n"); + printf("No VFS!\n"); exit(1); } vfs->ChDir("/this/"); @@ -135,21 +135,21 @@ csRef<iDocumentNode> root = GetRootNode(UPDATERINFO_FILENAME); if(!root) { - printOutput("Unable to get root node\r\r\n"); + printOutput("Unable to get root node\n"); return; } csRef<iDocumentNode> confignode = root->GetNode("config"); if (!confignode) { - printOutput("Couldn't find config node in configfile!\r\r\n"); + printOutput("Couldn't find config node in configfile!\n"); return; } // Load updater config if (!config->GetCurrentConfig()->Initialize(confignode)) { - printOutput("Failed to Initialize mirror config current!\r\r\n"); + printOutput("Failed to Initialize mirror config current!\n"); return; } @@ -165,7 +165,7 @@ if(config->UpdateExecs() && checkUpdater()) { - printOutput("Update Available!\r\r\n"); + printOutput("Update Available!\n"); // If using a GUI, prompt user whether or not to update. if(!appName.Compare("psupdater")) @@ -197,12 +197,12 @@ return; } - printOutput("No updates needed!\r\r\nChecking for updates to all files: "); + printOutput("No updates needed!\nChecking for updates to all files: "); // Check for normal updates. if(checkGeneral()) { - printOutput("Updates Available!\r\r\n"); + printOutput("Updates Available!\n"); // Mark update as incomplete. config->GetConfigFile()->SetBool("Update.Clean", false); config->GetConfigFile()->Save(); @@ -229,10 +229,10 @@ // Mark update as complete and clean up. config->GetConfigFile()->SetBool("Update.Clean", true); config->GetConfigFile()->Save(); - printOutput("Update finished!\r\r\n"); + printOutput("Update finished!\n"); } else - printOutput("No updates needed!\r\r\n"); + printOutput("No updates needed!\n"); delete downloader; @@ -252,20 +252,20 @@ csRef<iDocumentNode> root = GetRootNode(UPDATERINFO_FILENAME); if(!root) { - printOutput("Unable to get root node\r\r\n"); + printOutput("Unable to get root node\n"); return false; } csRef<iDocumentNode> confignode = root->GetNode("config"); if (!confignode) { - printOutput("Couldn't find config node in configfile!\r\r\n"); + printOutput("Couldn't find config node in configfile!\n"); return false; } if (!config->GetNewConfig()->Initialize(confignode)) { - printOutput("Failed to Initialize mirror config new!\r\r\n"); + printOutput("Failed to Initialize mirror config new!\n"); return false; } @@ -298,7 +298,7 @@ if(!name.Compare(oldCv->GetName())) { // There's a problem and we can't continue. Throw a boo boo and clean up. - printOutput("Local config and server config are incompatible!\r\r\n"); + printOutput("Local config and server config are incompatible!\n"); fileUtil->RemoveFile("/this/updaterinfo.xml"); fileUtil->MoveFile("/this/updaterinfo.xml.bak", "/this/updaterinfo.xml", true, false); return false; @@ -319,7 +319,7 @@ csRef<iDocumentSystem> xml = csPtr<iDocumentSystem> (new csTinyDocumentSystem); if (!xml) { - printOutput("Could not load the XML Document System\r\r\n"); + printOutput("Could not load the XML Document System\n"); return NULL; } @@ -327,7 +327,7 @@ csRef<iDataBuffer> buf = vfs->ReadFile(nodeName); if (!buf || !buf->GetSize()) { - printOutput("Couldn't open xml file '%s'!\r\n", nodeName); + printOutput("Couldn't open xml file '%s'!\n", nodeName); return NULL; } @@ -336,7 +336,7 @@ const char* error = configdoc->Parse(buf); if (error) { - printOutput("XML Parsing error in file '%s': %s.\r\n", nodeName, error); + printOutput("XML Parsing error in file '%s': %s.\n", nodeName, error); return NULL; } @@ -367,7 +367,7 @@ { case 1: // We've downloaded the new file and executed it. { - printOutput("Copying new files!\r\n"); + printOutput("Copying new files!\n"); // Construct executable names. csString tempName = appName; @@ -407,7 +407,7 @@ case 2: // We're now running the new updater in the correct location. { // Clean up left over files. - printOutput("\r\nCleaning up!\r\n"); + printOutput("\nCleaning up!\n"); // Construct zip name. csString zip = appName; @@ -424,7 +424,7 @@ } default: // We need to extract the new updater and execute it. { - printOutput("Beginning self update!\r\n"); + printOutput("Beginning self update!\n"); // Construct zip name. csString zip = appName; @@ -438,7 +438,7 @@ csRef<iDataBuffer> buffer = vfs->ReadFile("/this/" + zip, true); if (!buffer) { - printOutput("Could not get MD5 of updater zip!!\r\n"); + printOutput("Could not get MD5 of updater zip!!\n"); return false; } @@ -447,7 +447,7 @@ if(!md5sum.Compare(config->GetNewConfig()->GetUpdaterVersionLatestMD5())) { - printOutput("md5sum of updater zip does not match correct md5sum!!\r\n"); + printOutput("md5sum of updater zip does not match correct md5sum!!\n"); return false; } @@ -480,7 +480,7 @@ case 2: // We're now running the new updater in the correct location. { // Clean up left over files. - printOutput("\r\nCleaning up!\r\n"); + printOutput("\nCleaning up!\n"); // Construct zip name. csString zip = appName; @@ -494,7 +494,7 @@ } default: // We need to extract the new updater and execute it. { - printOutput("Beginning self update!\r\n"); + printOutput("Beginning self update!\n"); // Construct zip name. csString zip = appName; @@ -508,7 +508,7 @@ csRef<iDataBuffer> buffer = vfs->ReadFile("/this/" + zip, true); if (!buffer) { - printOutput("Could not get MD5 of updater zip!!\r\n"); + printOutput("Could not get MD5 of updater zip!!\n"); return false; } @@ -518,7 +518,7 @@ if(!md5sum.Compare(config->GetNewConfig()->GetUpdaterVersionLatestMD5())) { - printOutput("md5sum of updater zip does not match correct md5sum!!\r\n"); + printOutput("md5sum of updater zip does not match correct md5sum!!\n"); return false; } @@ -579,7 +579,7 @@ if (!confignode) { - printOutput("Couldn't find config node in configfile!\r\n"); + printOutput("Couldn't find config node in configfile!\n"); return; } @@ -597,14 +597,14 @@ zip.AppendFmt("-%s.zip", newCv->GetName()); // Download update zip. - printOutput("Downloading update file..\r\n"); + printOutput("Downloading update file..\n"); downloader->DownloadFile(zip, zip, false, true); // Check md5sum is correct. csRef<iDataBuffer> buffer = vfs->ReadFile("/this/" + zip, true); if (!buffer) { - printOutput("Could not get MD5 of updater zip!!\r\n"); + printOutput("Could not get MD5 of updater zip!!\n"); return; } @@ -614,7 +614,7 @@ if(!md5sum.Compare(newCv->GetMD5Sum())) { - printOutput("md5sum of client zip does not match correct md5sum!!\r\n"); + printOutput("md5sum of client zip does not match correct md5sum!!\n"); return; } @@ -715,25 +715,25 @@ url.AppendFmt("%s/", config->GetNewConfig()->GetPlatform()); if(!downloader->DownloadFile(url.Append(newFilePath.GetData()), newFilePath.GetData(), true, true)) { - printOutput("\r\nUnable to update file: %s. Reverting file!\r\n", newFilePath.GetData()); + printOutput("\nUnable to update file: %s. Reverting file!\n", newFilePath.GetData()); fileUtil->CopyFile("/this/" + oldFilePath, "/this/" + newFilePath, true, false); } else - printOutput("Done!\r\n"); + printOutput("Done!\n"); } else - printOutput("Done!\r\n"); + printOutput("Done!\n"); } else { - printOutput("Done!\r\n"); + printOutput("Done!\n"); // Check md5sum is correct. printOutput("Checking for correct md5sum: "); csRef<iDataBuffer> buffer = vfs->ReadFile("/this/" + newFilePath, true); if(!buffer) { - printOutput("Could not get MD5 of patched file %s! Reverting file!\r\n", newFilePath.GetData()); + printOutput("Could not get MD5 of patched file %s! Reverting file!\n", newFilePath.GetData()); fileUtil->RemoveFile("/this/" + newFilePath); fileUtil->CopyFile("/this/" + oldFilePath, "/this/" + newFilePath, true, false); } @@ -746,12 +746,12 @@ if(!md5sum.Compare(fileMD5)) { - printOutput("md5sum of file %s does not match correct md5sum! Reverting file!\r\n", newFilePath.GetData()); + printOutput("md5sum of file %s does not match correct md5sum! Reverting file!\n", newFilePath.GetData()); fileUtil->RemoveFile("/this/" + newFilePath); fileUtil->CopyFile("/this/" + oldFilePath, "/this/" + newFilePath, true, false); } else - printOutput("Success!\r\n"); + printOutput("Success!\n"); } } // Clean up temp files. @@ -768,7 +768,7 @@ } else { - printf("Failed to unmount file %s\r\n", zip.GetData()); + printf("Failed to unmount file %s\n", zip.GetData()); } // Add version info to updaterinfo.xml.bak and oldCvs. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-16 08:27:52
|
Revision: 832 http://planeshift.svn.sourceforge.net/planeshift/?rev=832&view=rev Author: mgist Date: 2008-02-16 00:27:57 -0800 (Sat, 16 Feb 2008) Log Message: ----------- - Attempt to fix osx self-update. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-16 07:45:40 UTC (rev 831) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-16 08:27:57 UTC (rev 832) @@ -532,23 +532,28 @@ #else realName.Append(".bin"); #endif - // Remove old updater. - csString cmd; - cmd.AppendFmt("rm -Rf %s", realName.GetData()); - system(cmd.GetData()); + // Copy new files into place. + fileUtil->CopyFile("/zip/" + realName, "/this/" + realName, true, true); - // Copy new one into place. - cmd.Clear(); - cmd.AppendFmt("cp -Rf zip/* ."); - system(cmd.GetData()); + if(appName.Compare("pslaunch")) + { + csString artPath = "/art/"; + artPath.AppendFmt("%s.zip", appName.GetData()); + fileUtil->CopyFile("/zip" + artPath, artPath, true, false, true); + csString dataPath = "/data/gui/"; + dataPath.AppendFmt("%s.xml", appName.GetData()); + fileUtil->CopyFile("/zip" + dataPath, dataPath, true, false, true); + } + // Unmount zip. vfs->Unmount("/zip", realZipPath->GetData()); // Create a new process of the updater and exit. #if defined(CS_PLATFORM_MACOSX) - cmd.Clear(); - cmd.AppendFmt("open -a ./%s selfUpdateSecond", realName.GetData()); + csRef<iDataBuffer> realPath = vfs->GetRealPath("/this/" + realName); + csString cmd; + cmd.Format("open -a ./%s selfUpdateSecond", realPath.GetData()); system(cmd); #else if(fork() == 0) @@ -571,7 +576,7 @@ * After each iteration we need to update updaterinfo.xml.bak as well as the array. */ - // Start by fetching the configs. + // Start by fetching the configs. csRefArray<ClientVersion>& oldCvs = config->GetCurrentConfig()->GetClientVersions(); const csRefArray<ClientVersion>& newCvs = config->GetNewConfig()->GetClientVersions(); csRef<iDocumentNode> rootnode = GetRootNode(UPDATERINFO_OLD_FILENAME); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-16 08:29:06
|
Revision: 833 http://planeshift.svn.sourceforge.net/planeshift/?rev=833&view=rev Author: mgist Date: 2008-02-16 00:29:10 -0800 (Sat, 16 Feb 2008) Log Message: ----------- - Compile fix. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-16 08:27:57 UTC (rev 832) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-16 08:29:10 UTC (rev 833) @@ -553,7 +553,7 @@ #if defined(CS_PLATFORM_MACOSX) csRef<iDataBuffer> realPath = vfs->GetRealPath("/this/" + realName); csString cmd; - cmd.Format("open -a ./%s selfUpdateSecond", realPath.GetData()); + cmd.Format("open -a ./%s selfUpdateSecond", realPath->GetData()); system(cmd); #else if(fork() == 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-16 13:12:55
|
Revision: 839 http://planeshift.svn.sourceforge.net/planeshift/?rev=839&view=rev Author: mgist Date: 2008-02-16 05:13:00 -0800 (Sat, 16 Feb 2008) Log Message: ----------- - Crash fix. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-16 13:09:04 UTC (rev 838) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-16 13:13:00 UTC (rev 839) @@ -534,7 +534,7 @@ csString cmd; csRef<iDataBuffer> thisPath = vfs->GetRealPath("/this/"); - cmd.Format("cd %s; unzip -o %s", thisPath->GetData(), zip); + cmd.Format("cd %s; unzip -o %s", thisPath->GetData(), zip.GetData()); system(cmd); // Create a new process of the updater and exit. @@ -585,7 +585,7 @@ * After each iteration we need to update updaterinfo.xml.bak as well as the array. */ - // Start by fetching the configs. + // Start by fetching the configs. csRefArray<ClientVersion>& oldCvs = config->GetCurrentConfig()->GetClientVersions(); const csRefArray<ClientVersion>& newCvs = config->GetNewConfig()->GetClientVersions(); csRef<iDocumentNode> rootnode = GetRootNode(UPDATERINFO_OLD_FILENAME); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-16 13:21:40
|
Revision: 840 http://planeshift.svn.sourceforge.net/planeshift/?rev=840&view=rev Author: mgist Date: 2008-02-16 05:21:44 -0800 (Sat, 16 Feb 2008) Log Message: ----------- - More osx updater stuff. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-16 13:13:00 UTC (rev 839) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-16 13:21:44 UTC (rev 840) @@ -534,13 +534,13 @@ csString cmd; csRef<iDataBuffer> thisPath = vfs->GetRealPath("/this/"); - cmd.Format("cd %s; unzip -o %s", thisPath->GetData(), zip.GetData()); + cmd.Format("cd %s; unzip -oqq %s", thisPath->GetData(), zip.GetData()); system(cmd); // Create a new process of the updater and exit. csRef<iDataBuffer> realPath = vfs->GetRealPath("/this/" + realName); cmd.Clear(); - cmd.Format("open -a ./%s selfUpdateSecond", realPath->GetData()); + cmd.Format("open -a %s 'selfUpdateSecond'", realPath->GetData()); system(cmd); #else realName.Append(".bin"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-16 15:07:36
|
Revision: 841 http://planeshift.svn.sourceforge.net/planeshift/?rev=841&view=rev Author: mgist Date: 2008-02-16 07:07:38 -0800 (Sat, 16 Feb 2008) Log Message: ----------- - More fixes. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-16 13:21:44 UTC (rev 840) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-16 15:07:38 UTC (rev 841) @@ -527,10 +527,7 @@ return false; } - csString realName = appName; - #if defined(CS_PLATFORM_MACOSX) - realName.Append(".app"); csString cmd; csRef<iDataBuffer> thisPath = vfs->GetRealPath("/this/"); @@ -538,12 +535,11 @@ system(cmd); // Create a new process of the updater and exit. - csRef<iDataBuffer> realPath = vfs->GetRealPath("/this/" + realName); cmd.Clear(); - cmd.Format("open -a %s 'selfUpdateSecond'", realPath->GetData()); + cmd.Format("%s%s.app/Contents/MacOS/%s_static selfUpdateSecond", realPath->GetData(), appName.GetData(), appName.GetData()); system(cmd); #else - realName.Append(".bin"); + appName.Append(".bin"); // Mount zip csRef<iDataBuffer> realZipPath = vfs->GetRealPath("/this/" + zip); @@ -767,9 +763,9 @@ else printOutput("Success!\n"); } + fileUtil->RemoveFile("/this/" + oldFilePath); } // Clean up temp files. - fileUtil->RemoveFile("/this/" + oldFilePath); fileUtil->RemoveFile("/this/" + diff, false); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-16 15:27:55
|
Revision: 842 http://planeshift.svn.sourceforge.net/planeshift/?rev=842&view=rev Author: mgist Date: 2008-02-16 07:28:00 -0800 (Sat, 16 Feb 2008) Log Message: ----------- - Change exec check order. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-16 15:07:38 UTC (rev 841) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-16 15:28:00 UTC (rev 842) @@ -163,7 +163,7 @@ printOutput("Checking for updates to the updater: "); - if(config->UpdateExecs() && checkUpdater()) + if(checkUpdater() && config->UpdateExecs()) { printOutput("Update Available!\n"); @@ -275,7 +275,7 @@ } // Compare Versions. - return(config->GetNewConfig()->GetUpdaterVersionLatest() > UPDATER_VERSION); + return(!config->UpdateExecs() && config->GetNewConfig()->GetUpdaterVersionLatest() > UPDATER_VERSION); } bool UpdaterEngine::checkGeneral() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-16 23:41:45
|
Revision: 845 http://planeshift.svn.sourceforge.net/planeshift/?rev=845&view=rev Author: mgist Date: 2008-02-16 15:41:50 -0800 (Sat, 16 Feb 2008) Log Message: ----------- - Compile fix. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-16 21:44:55 UTC (rev 844) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-16 23:41:50 UTC (rev 845) @@ -536,7 +536,7 @@ // Create a new process of the updater and exit. cmd.Clear(); - cmd.Format("%s%s.app/Contents/MacOS/%s_static selfUpdateSecond", realPath->GetData(), appName.GetData(), appName.GetData()); + cmd.Format("%s%s.app/Contents/MacOS/%s_static selfUpdateSecond", thisPath->GetData(), appName.GetData(), appName.GetData()); system(cmd); #else appName.Append(".bin"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-17 20:29:25
|
Revision: 858 http://planeshift.svn.sourceforge.net/planeshift/?rev=858&view=rev Author: mgist Date: 2008-02-17 12:29:28 -0800 (Sun, 17 Feb 2008) Log Message: ----------- - Linux compile error fix. Modified Paths: -------------- trunk/src/pslaunch/updaterengine.cpp Modified: trunk/src/pslaunch/updaterengine.cpp =================================================================== --- trunk/src/pslaunch/updaterengine.cpp 2008-02-17 19:48:58 UTC (rev 857) +++ trunk/src/pslaunch/updaterengine.cpp 2008-02-17 20:29:28 UTC (rev 858) @@ -539,7 +539,8 @@ cmd.Format("%s%s.app/Contents/MacOS/%s_static selfUpdateSecond", thisPath->GetData(), appName.GetData(), appName.GetData()); system(cmd); #else - appName.Append(".bin"); + csString realName = appName; + realName.Append(".bin"); // Mount zip csRef<iDataBuffer> realZipPath = vfs->GetRealPath("/this/" + zip); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |