pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[win] updmanager: exclude passing additional installation arguments

Browse Source
This commit is contained in:
SimplestStudio
2024-09-07 09:42:16 +03:00
parent aa10fe7cc1
commit 8713f91dd9
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
win-linux/extras/update-daemon/src/classes/csvcmanager.cpp
View File

@ -371,7 +371,7 @@ void CSvcManager::init()
case MSG_StartInstallPackage:
if (!m_packageData->fileName.empty() && NS_File::getFileHash(m_packageData->fileName) == m_packageData->hash) {
__GLOBAL_LOCK
startInstallPackage(params[1]);
startInstallPackage();
__UNLOCK
} else {
m_socket->sendMessage(MSG_OtherError, _T("SVC_TXT_ERR_MD5"));
@ -899,7 +899,7 @@ void CSvcManager::startReplacingService(const bool restartAfterUpdate)
}
#ifdef _WIN32
void CSvcManager::startInstallPackage(const tstring &advArgs)
void CSvcManager::startInstallPackage()
{
// Verify the signature of executable files
if (!NS_File::verifyEmbeddedSignature(m_packageData->fileName)) {
@ -913,11 +913,9 @@ void CSvcManager::startInstallPackage(const tstring &advArgs)
args += _T(" ") + m_packageData->packageArgs;
} else {
args = m_packageData->packageArgs;
}
if (!advArgs.empty()) {
if (!args.empty())
args += _T(" ");
args += advArgs;
args += _T("/LANG=") + NS_Utils::GetAppLanguage();
}
if (!NS_File::runProcess(m_packageData->fileType == _T("msi") ? _T("msiexec.exe") : m_packageData->fileName, args))
NS_Logger::WriteLog(_TR("An error occurred while start install updates!"), true);

2
win-linux/extras/update-daemon/src/classes/csvcmanager.h
View File

@ -67,7 +67,7 @@ private:
void startReplacingFiles(const tstring &packageType, const bool restartAfterUpdate);
void startReplacingService(const bool restartAfterUpdate);
#ifdef _WIN32
void startInstallPackage(const tstring &advArgs);
void startInstallPackage();
#endif
struct PackageData;