aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 09:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Use getInstallerInstalledFilePath() to get installed Installer full path

Browse source
This commit is contained in:
kervala 2016-10-16 17:26:05 +02:00
parent 7a3d808195
commit 5b6c0285cd
3 changed files with 42 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -756,12 +756,15 @@ QString CConfigFile::getInstallerCurrentDirPath() const
return QApplication::applicationDirPath(); return QApplication::applicationDirPath();
} }
QString CConfigFile::getInstallerOriginalFilePath() const QString CConfigFile::getInstallerInstalledFilePath() const
{ {
return getInstallerOriginalDirPath() + "/" + QFileInfo(QApplication::applicationFilePath()).fileName(); // return an empty string, if no Installer filename in config
if (m_installerFilename.isEmpty()) return "";
return getInstallerInstalledDirPath() + "/" + m_installerFilename;
} }
QString CConfigFile::getInstallerOriginalDirPath() const QString CConfigFile::getInstallerInstalledDirPath() const
{ {
return m_installationDirectory; return m_installationDirectory;
} }

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

@ -124,8 +124,8 @@ public:
QString getInstallerCurrentFilePath() const; QString getInstallerCurrentFilePath() const;
QString getInstallerCurrentDirPath() const; QString getInstallerCurrentDirPath() const;
QString getInstallerOriginalFilePath() const; QString getInstallerInstalledFilePath() const;
QString getInstallerOriginalDirPath() const; QString getInstallerInstalledDirPath() const;
QString getInstallerMenuShortcutFullPath() const; QString getInstallerMenuShortcutFullPath() const;
QString getInstallerDesktopShortcutFullPath() const; QString getInstallerDesktopShortcutFullPath() const;

77
code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
View file

@ -727,13 +727,12 @@ void COperationDialog::copyInstaller()
QString destinationDirectory = config->getInstallationDirectory(); QString destinationDirectory = config->getInstallationDirectory();
// rename old client to installer // rename old client to installer
QString newInstallerFilename = config->getInstallerFilename();
if (!newInstallerFilename.isEmpty()) QString oldInstallerFullPath = QApplication::applicationFilePath();
QString newInstallerFullPath = config->getInstallerInstalledFilePath();
if (!newInstallerFullPath.isEmpty())
{ {
QString oldInstallerFullPath = QApplication::applicationFilePath();
QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename;
// always copy new installers // always copy new installers
CFilesCopier copier(this); CFilesCopier copier(this);
copier.setIncludeFilter(config->getInstallerRequiredFiles()); copier.setIncludeFilter(config->getInstallerRequiredFiles());
@ -931,36 +930,31 @@ bool COperationDialog::createAddRemoveEntry()
{ {
CConfigFile *config = CConfigFile::getInstance(); CConfigFile *config = CConfigFile::getInstance();
QString newInstallerFilename = config->getInstallerFilename(); QString newInstallerFullPath = config->getInstallerInstalledFilePath();
if (!newInstallerFilename.isEmpty()) if (!newInstallerFullPath.isEmpty() && QFile::exists(newInstallerFullPath))
{ {
QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename;
if (QFile::exists(newInstallerFullPath))
{
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QSettings settings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ryzom", QSettings::NativeFormat); QSettings settings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ryzom", QSettings::NativeFormat);
QString nativeFullPath = QDir::toNativeSeparators(newInstallerFullPath); QString nativeFullPath = QDir::toNativeSeparators(newInstallerFullPath);
settings.setValue("Comments", config->getProductComments()); settings.setValue("Comments", config->getProductComments());
settings.setValue("DisplayIcon", nativeFullPath + ",0"); settings.setValue("DisplayIcon", nativeFullPath + ",0");
settings.setValue("DisplayName", QApplication::applicationName()); settings.setValue("DisplayName", QApplication::applicationName());
settings.setValue("InstallDate", QDateTime::currentDateTime().toString("Ymd")); settings.setValue("InstallDate", QDateTime::currentDateTime().toString("Ymd"));
settings.setValue("InstallLocation", config->getInstallationDirectory()); settings.setValue("InstallLocation", config->getInstallationDirectory());
settings.setValue("NoModify", 0); settings.setValue("NoModify", 0);
settings.setValue("NoRemove", 0); settings.setValue("NoRemove", 0);
settings.setValue("NoRepair", 0); settings.setValue("NoRepair", 0);
if (!config->getProductPublisher().isEmpty()) settings.setValue("Publisher", config->getProductPublisher()); if (!config->getProductPublisher().isEmpty()) settings.setValue("Publisher", config->getProductPublisher());
settings.setValue("QuietUninstallString", nativeFullPath + " -u -s"); settings.setValue("QuietUninstallString", nativeFullPath + " -u -s");
settings.setValue("UninstallString", nativeFullPath + " -u"); settings.setValue("UninstallString", nativeFullPath + " -u");
if (!config->getProductUpdateUrl().isEmpty()) settings.setValue("URLUpdateInfo", config->getProductUpdateUrl()); if (!config->getProductUpdateUrl().isEmpty()) settings.setValue("URLUpdateInfo", config->getProductUpdateUrl());
if (!config->getProductAboutUrl().isEmpty()) settings.setValue("URLInfoAbout", config->getProductAboutUrl()); if (!config->getProductAboutUrl().isEmpty()) settings.setValue("URLInfoAbout", config->getProductAboutUrl());
if (!config->getProductHelpUrl().isEmpty()) settings.setValue("HelpLink", config->getProductHelpUrl()); if (!config->getProductHelpUrl().isEmpty()) settings.setValue("HelpLink", config->getProductHelpUrl());
// ModifyPath // ModifyPath
#endif #endif
}
} }
updateAddRemoveEntry(); updateAddRemoveEntry();
@ -974,27 +968,24 @@ bool COperationDialog::updateAddRemoveEntry()
{ {
CConfigFile *config = CConfigFile::getInstance(); CConfigFile *config = CConfigFile::getInstance();
QString newInstallerFilename = config->getInstallerFilename(); QString newInstallerFullPath = config->getInstallerInstalledFilePath();
if (!newInstallerFilename.isEmpty()) if (!newInstallerFullPath.isEmpty() && QFile::exists(newInstallerFullPath))
{ {
QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename; QString newInstallerFilename = config->getInstallerFilename();
if (QFile::exists(newInstallerFullPath))
{
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QSettings settings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ryzom", QSettings::NativeFormat); QSettings settings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ryzom", QSettings::NativeFormat);
QString version = QApplication::applicationVersion(); QString version = QApplication::applicationVersion();
settings.setValue("DisplayVersion", version); settings.setValue("DisplayVersion", version);
settings.setValue("EstimatedSize", (quint32)(getDirectorySize(config->getInstallationDirectory(), true) / 1024)); // size if in KiB settings.setValue("EstimatedSize", (quint32)(getDirectorySize(config->getInstallationDirectory(), true) / 1024)); // size if in KiB
QStringList versionTokens = version.split('.'); QStringList versionTokens = version.split('.');
settings.setValue("MajorVersion", versionTokens[0].toInt()); settings.setValue("MajorVersion", versionTokens[0].toInt());
settings.setValue("MinorVersion", versionTokens[1].toInt()); settings.setValue("MinorVersion", versionTokens[1].toInt());
#endif #endif
}
} }
return true; return true;
@ -1161,7 +1152,7 @@ void COperationDialog::deleteComponentsInstaller()
dir.removeRecursively(); dir.removeRecursively();
} }
path = config->getInstallerOriginalDirPath(); path = config->getInstallerInstalledDirPath();
QStringList files = config->getInstallerRequiredFiles(); QStringList files = config->getInstallerRequiredFiles();
foreach(const QString &file, files) foreach(const QString &file, files)