Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-10-17 13:30:00 +02:00
commit a54d032093

View file

@ -933,7 +933,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
if (wantRyzomRestart) if (wantRyzomRestart)
{ {
// wait until client not in memory anymore // 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 -x \"%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) // launch upgrade script if present (it'll execute additional steps like moving or deleting files)