Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-09-20 18:36:02 +02:00
commit d95aa50bdf
3 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
View file

@ -27,8 +27,7 @@
CConfigFile *CConfigFile::s_instance = NULL; CConfigFile *CConfigFile::s_instance = NULL;
CConfigFile::CConfigFile(QObject *parent):QObject(parent), m_version(-1), CConfigFile::CConfigFile(QObject *parent):QObject(parent), m_version(-1),
m_defaultServerIndex(0), m_defaultProfileIndex(0), m_use64BitsClient(false), m_shouldUninstallOldClient(true), m_defaultServerIndex(0), m_defaultProfileIndex(0), m_use64BitsClient(false), m_shouldUninstallOldClient(true)
m_uninstallingOldClient(false)
{ {
s_instance = this; s_instance = this;
@ -464,12 +463,29 @@ void CConfigFile::setShouldUninstallOldClient(bool on)
bool CConfigFile::uninstallingOldClient() const bool CConfigFile::uninstallingOldClient() const
{ {
return m_uninstallingOldClient; return QFile::exists(getInstallationDirectory() + "/ryzom_installer_uninstalling_old_client");
} }
void CConfigFile::setUninstallingOldClient(bool on) void CConfigFile::setUninstallingOldClient(bool on)
{ {
m_uninstallingOldClient = on; QString filename = getInstallationDirectory() + "/ryzom_installer_uninstalling_old_client";
if (on)
{
// writing a file to avoid asking several times when relaunching installer
QFile file(filename);
if (file.open(QFile::WriteOnly))
{
file.write("empty");
file.close();
}
}
else
{
// deleting the temporary file
if (QFile::exists(filename)) QFile::remove(filename);
}
} }
QString CConfigFile::expandVariables(const QString &str) const QString CConfigFile::expandVariables(const QString &str) const
@ -983,7 +999,7 @@ OperationStep CConfigFile::getInstallNextStep() const
if (!settings.contains("InstallLocation")) return CreateAddRemoveEntry; if (!settings.contains("InstallLocation")) return CreateAddRemoveEntry;
#endif #endif
if (!m_uninstallingOldClient && m_shouldUninstallOldClient && !getSrcServerDirectory().isEmpty() && QFile::exists(getSrcServerDirectory() + "/Uninstall.exe")) if (!uninstallingOldClient() && m_shouldUninstallOldClient && !getSrcServerDirectory().isEmpty() && QFile::exists(getSrcServerDirectory() + "/Uninstall.exe"))
{ {
return UninstallOldClient; return UninstallOldClient;
} }

1
code/ryzom/tools/client/ryzom_installer/src/configfile.h
View file

@ -152,7 +152,6 @@ private:
QString m_srcDirectory; QString m_srcDirectory;
bool m_use64BitsClient; bool m_use64BitsClient;
bool m_shouldUninstallOldClient; bool m_shouldUninstallOldClient;
bool m_uninstallingOldClient;
QString m_language; QString m_language;
QString m_defaultConfigPath; QString m_defaultConfigPath;

7
code/ryzom/tools/client/ryzom_installer/src/main.cpp
View file

@ -161,13 +161,16 @@ int main(int argc, char *argv[])
foreach(const QString &dir, dirs) foreach(const QString &dir, dirs)
{ {
QDir(dir).removeRecursively(); // delete each directory
QDir dirToRemove(tempDir);
dirToRemove.cd(dir);
dirToRemove.removeRecursively();
} }
tempPath += QString("/ryzom_installer_%1").arg(QDateTime::currentMSecsSinceEpoch()); tempPath += QString("/ryzom_installer_%1").arg(QDateTime::currentMSecsSinceEpoch());
// copy installer and required files to TEMP directory // copy installer and required files to TEMP directory
if (copyInstallerFiles(config.getInstallerRequiredFiles(), tempPath)) if (QDir().mkdir(tempPath) && copyInstallerFiles(config.getInstallerRequiredFiles(), tempPath))
{ {
QString tempFile = tempPath + "/" + QFileInfo(QApplication::applicationFilePath()).fileName(); QString tempFile = tempPath + "/" + QFileInfo(QApplication::applicationFilePath()).fileName();