From 8f2fc49d7d817a771e07e7943672a21d735ce1f8 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 17 Oct 2016 13:07:32 +0200 Subject: [PATCH 1/3] Changed: Don't need arguments --HG-- branch : develop --- code/ryzom/tools/client/ryzom_installer/src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/main.cpp b/code/ryzom/tools/client/ryzom_installer/src/main.cpp index 5e0bea7a9..df12afbe1 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/main.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/main.cpp @@ -256,14 +256,14 @@ int main(int argc, char *argv[]) { #ifndef _DEBUG // restart more recent installed Installer version - if (QProcess::startDetached(config.getInstallerInstalledFilePath(), QApplication::arguments())) return 0; + if (QProcess::startDetached(config.getInstallerInstalledFilePath())) return 0; #endif } else if (step == Done) { #if defined(Q_OS_WIN) && !defined(_DEBUG) // restart Installer, so it could be copied in TEMP and allowed to update itself - if (QProcess::startDetached(QApplication::applicationFilePath(), QApplication::arguments())) return 0; + if (QProcess::startDetached(QApplication::applicationFilePath())) return 0; #endif } } From 273d5ab80dc703bb32a53490761dc76f39859b17 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 17 Oct 2016 13:08:14 +0200 Subject: [PATCH 2/3] Fixed: getInstallerCurrentFilePath instead of getInstallerCurrentDirPath --HG-- branch : develop --- code/ryzom/tools/client/ryzom_installer/src/configfile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index b09fa4e44..d771aad67 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -983,7 +983,7 @@ OperationStep CConfigFile::getInstallNextStep() const case -1: return LaunchInstalledInstaller; // continue only if 0 and launched Installer is the installed one - default: if (getInstallerCurrentDirPath() != getInstallerInstalledFilePath() && QFile::exists(getInstallerInstalledFilePath())) return LaunchInstalledInstaller; + default: if (getInstallerCurrentFilePath() != getInstallerInstalledFilePath() && QFile::exists(getInstallerInstalledFilePath())) return LaunchInstalledInstaller; } // no default profile From 3a2488a126963e35e2908ff01204e6d8a849b58d Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 17 Oct 2016 13:08:44 +0200 Subject: [PATCH 3/3] Fixed: Escape path (it can contains spaces) --HG-- branch : develop --- code/ryzom/client/src/login_patch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index 4489f11bb..4c665da3d 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -933,7 +933,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool if (wantRyzomRestart) { // wait until client not in memory anymore - contentSuffix += toString("until ! pgrep %s > /dev/null; do sleep 1; done\n", CFile::getFilename(RyzomFilename).c_str()); + contentSuffix += toString("until ! pgrep \"%s\" > /dev/null; do sleep 1; done\n", CFile::getFilename(RyzomFilename).c_str()); } // launch upgrade script if present (it'll execute additional steps like moving or deleting files)