pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

openSUSE added

Browse Source
This commit is contained in:
Vikulov Dmitry
2023-06-21 11:40:53 +03:00
parent 6811fc9877
commit 22f5da518d
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
DesktopEditor/vboxtester/main.cpp
View File

@ -107,6 +107,7 @@ bool SplitStringAsVector(const std::wstring& sData, const std::wstring& sDelimit
enum SystemType
{
Debian = 0,
OpenSuse,
RedHat,
Empty
};
@ -142,7 +143,7 @@ public:
bool IsRedHat()
{
return m_eType == RedHat;
return m_eType == RedHat || m_eType == OpenSuse;
}
std::wstring ToString()
@ -309,6 +310,8 @@ public:
else if ( sOsLower.find(L"red hat") != std::wstring::npos ||
sOsLower.find(L"fedora") != std::wstring::npos )
eType = RedHat;
else if ( sOsLower.find(L"opensuse") != std::wstring::npos )
eType = OpenSuse;
m_arrVms.push_back(new CVm(sName, sGuid, sOs, eType));
}
@ -623,10 +626,14 @@ public:
}
else if ( m_pVm->IsRedHat() )
{
std::wstring sPackageInstaller = L"yum";
if ( m_pVm->m_eType == OpenSuse )
sPackageInstaller = L"zypper";
sData = L"#!/bin/bash\n" \
L"echo \"Install DesktopEditors\"\n" \
L"yum remove onlyoffice-desktopeditors -y\n" \
L"yum install -y ./" + sDistribFile;
+ sPackageInstaller + L" remove onlyoffice-desktopeditors -y\n" \
+ sPackageInstaller + L" install -y ./" + sDistribFile;
}
NSFile::CFileBinary oFile;
@ -959,7 +966,7 @@ private:
for (size_t i = 0; i < m_arrVms.size(); i++)
{
if ( m_arrVms[i]->IsDebian() )
if ( m_arrVms[i]->IsDebian() || m_arrVms[i]->IsDebian() )
{
arrVms.push_back(m_arrVms[i]);
}
@ -1167,7 +1174,7 @@ int main(int argc, char** argv)
{
oTester.SetStartDebian();
}
else if (sKey == sCmdStartAll)
else if (sKey == sCmdStartRedHat)
{
oTester.SetStartRedHat();
}
@ -1187,6 +1194,9 @@ int main(int argc, char** argv)
std::wstring sGuid = pVm->m_sGuid;
std::wstring sName = pVm->m_sName;
if ( sName != L"openSUSE" )
continue;
oTester.SetVm(pVm);
oTester.StartVm();