mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Merge with develop
This commit is contained in:
parent
8a52b34e09
commit
25d66dafa2
3 changed files with 4 additions and 4 deletions
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue