diff --git a/bazaar/Updater/Updater.cpp b/bazaar/Updater/Updater.cpp index fa1ccf86c..84d7d1faf 100644 --- a/bazaar/Updater/Updater.cpp +++ b/bazaar/Updater/Updater.cpp @@ -35,9 +35,9 @@ String Updater::GetPlatformRoot(void) /////////////////////////////////////////////////////////////////////////////////////// // constructor Updater::Updater() -{ - // defaults to web server mode - isWebServer = true; +{ + // defaults to web server mode + isWebServer = true; // fetches and stores environment, we need to change it later environment <<= Environment(); @@ -556,22 +556,22 @@ void Updater::RestartApp(RestartModes restartMode) // fetch list of available app versions ProductVersions Updater::FetchVersions(void) -{ - String verStr; - - if(isWebServer) +{ + String verStr; + + if(isWebServer) { HttpClient http; http.TimeoutMsecs(1000); - http.URL(AppendFileName(GetPlatformRoot(), "versions")); + http.URL(GetPlatformRoot() + "versions"); // fetch version file from server verStr = http.Execute(); int err = http.GetStatusCode(); if(err != 200) - return ProductVersions(); - } - else + return ProductVersions(); + } + else verStr = LoadFile(GetPlatformRoot() + "versions"); verStr = TrimBoth(verStr); @@ -602,20 +602,20 @@ bool Updater::FetchApp(ProductVersion ver, bool devel) if(!ver) ver = FetchMaxValidVersion(acceptDevelVersions); if(!ver) - return false; - + return false; + String appServerPath, destPath; #ifdef PLATFORM_POSIX - appServerPath = AppendFileName(GetPlatformRoot(), ver.ToString() + "/" + appName); + appServerPath = GetPlatformRoot() + ver.ToString() + "/" + appName; destPath = AppendFileName(GetProgramsFolder(), appName); #else - appServerPath = AppendFileName(GetPlatformRoot(), ver.ToString() + "/" + appName + ".exe"); + appServerPath = GetPlatformRoot() + ver.ToString() + "/" + appName + ".exe"; destPath = AppendFileName(GetProgramsFolder(), appName + "/" + appName + ".exe"); #endif - - if(isWebServer) - { - HttpClient http; + + if(isWebServer) + { + HttpClient http; http.URL(appServerPath); http.TimeoutMsecs(1000*60*30); http.MaxContentSize(100000000); @@ -632,9 +632,9 @@ bool Updater::FetchApp(ProductVersion ver, bool devel) // replaces/installs app if(!SaveFile(destPath, appBuffer)) - return false; - } - else + return false; + } + else FileCopy(appServerPath, destPath); #ifdef PLATFORM_POSIX if(chmod(~destPath, 0755) != 0)