mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-23 02:00:20 +07:00
chore: defines for update controller (#2634)
This commit is contained in:
@@ -23,7 +23,7 @@ namespace
|
|||||||
#if defined(Q_OS_WINDOWS)
|
#if defined(Q_OS_WINDOWS)
|
||||||
const QLatin1String kInstallerRemoteFileNamePattern("AmneziaVPN_%1_windows_x64.exe");
|
const QLatin1String kInstallerRemoteFileNamePattern("AmneziaVPN_%1_windows_x64.exe");
|
||||||
const QString kInstallerLocalPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/AmneziaVPN_installer.exe";
|
const QString kInstallerLocalPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/AmneziaVPN_installer.exe";
|
||||||
#elif defined(Q_OS_MACOS)
|
#elif defined(Q_OS_MACOS) && !defined(MACOS_NE)
|
||||||
const QLatin1String kInstallerRemoteFileNamePattern("AmneziaVPN_%1_macos_x64.pkg");
|
const QLatin1String kInstallerRemoteFileNamePattern("AmneziaVPN_%1_macos_x64.pkg");
|
||||||
const QString kInstallerLocalPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/AmneziaVPN.pkg";
|
const QString kInstallerLocalPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/AmneziaVPN.pkg";
|
||||||
#elif defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
|
#elif defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
|
||||||
@@ -202,7 +202,7 @@ void UpdateController::handleNetworkError(QNetworkReply* reply, const QString& o
|
|||||||
|
|
||||||
QString UpdateController::composeDownloadUrl() const
|
QString UpdateController::composeDownloadUrl() const
|
||||||
{
|
{
|
||||||
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
|
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) && !defined(MACOS_NE)
|
||||||
const QString fileName = QString(kInstallerRemoteFileNamePattern).arg(m_version);
|
const QString fileName = QString(kInstallerRemoteFileNamePattern).arg(m_version);
|
||||||
return m_baseUrl + "/" + fileName;
|
return m_baseUrl + "/" + fileName;
|
||||||
#else
|
#else
|
||||||
@@ -212,7 +212,7 @@ QString UpdateController::composeDownloadUrl() const
|
|||||||
|
|
||||||
void UpdateController::runInstaller()
|
void UpdateController::runInstaller()
|
||||||
{
|
{
|
||||||
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
|
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) && !defined(MACOS_NE)
|
||||||
if (m_downloadUrl.isEmpty()) {
|
if (m_downloadUrl.isEmpty()) {
|
||||||
logger.error() << "Download URL is empty";
|
logger.error() << "Download URL is empty";
|
||||||
return;
|
return;
|
||||||
@@ -244,7 +244,7 @@ void UpdateController::runInstaller()
|
|||||||
|
|
||||||
#if defined(Q_OS_WINDOWS)
|
#if defined(Q_OS_WINDOWS)
|
||||||
runWindowsInstaller(kInstallerLocalPath);
|
runWindowsInstaller(kInstallerLocalPath);
|
||||||
#elif defined(Q_OS_MACOS)
|
#elif defined(Q_OS_MACOS) && !defined(MACOS_NE)
|
||||||
runMacInstaller(kInstallerLocalPath);
|
runMacInstaller(kInstallerLocalPath);
|
||||||
#elif defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
|
#elif defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
|
||||||
runLinuxInstaller(kInstallerLocalPath);
|
runLinuxInstaller(kInstallerLocalPath);
|
||||||
@@ -284,7 +284,7 @@ int UpdateController::runWindowsInstaller(const QString &installerPath)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(Q_OS_MACOS)
|
#if defined(Q_OS_MACOS) && !defined(MACOS_NE)
|
||||||
int UpdateController::runMacInstaller(const QString &installerPath)
|
int UpdateController::runMacInstaller(const QString &installerPath)
|
||||||
{
|
{
|
||||||
// Create temporary directory for extraction
|
// Create temporary directory for extraction
|
||||||
|
|||||||
Reference in New Issue
Block a user