Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-01-03 17:39:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updater: fix macOS

Browse source
This commit is contained in:
tobtoht 2023-03-14 15:21:42 +01:00
parent a4e81953da
commit e9f17f156b
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
3 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -295,7 +295,7 @@ if(STATIC AND NOT Qt6_FOUND)
endif()
endif()
if(STATIC AND UNIX AND Qt6_FOUND)
if(STATIC AND UNIX AND NOT APPLE AND Qt6_FOUND)
target_link_libraries(feather Qt6::QComposePlatformInputContextPlugin)
endif()

3
src/MainWindow.cpp
View file

@ -364,9 +364,6 @@ void MainWindow::initMenu() {
#else
ui->actionCheckForUpdates->setVisible(false);
#endif
#if defined(Q_OS_MACOS)
ui->actionCheckForUpdates->setVisible(false);
#endif
connect(ui->actionOfficialWebsite, &QAction::triggered, [this](){Utils::externalLinkWarning(this, "https://featherwallet.org");});
connect(ui->actionDonate_to_Feather, &QAction::triggered, this, &MainWindow::donateButtonClicked);

39
src/dialog/UpdateDialog.cpp
View file

@ -12,6 +12,7 @@
#include "utils/NetworkManager.h"
#include "utils/Updater.h"
#include "utils/Utils.h"
#include "utils/SemanticVersion.h"
#include "zip.h"
@ -251,17 +252,33 @@ void UpdateDialog::installUpdateMac() {
QString appPath = Utils::applicationPath();
QDir appDir(appPath);
if (appPath.endsWith("Contents/MacOS")) {
appDir.cd("../../..");
appDir.cd("../..");
}
if (appPath.contains("AppTranslocation")) {
this->onInstallError("Error: Application is translocated. Please move it to the Applications folder and try again.");
return;
}
if (!SemanticVersion::isValid(SemanticVersion::fromString(m_updater->version))) {
this->onInstallError(QString("Error: Invalid version: %1").arg(m_updater->version));
return;
}
QString appName = QString("feather-%1").arg(m_updater->version);
QString zipName = QString("%1.zip").arg(appName);
QString fPath = appDir.filePath(zipName);
QString downloadsPath = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
if (downloadsPath.isEmpty()) {
this->onInstallError(QString("Error: Could not determine download location"));
return;
}
QString fPath = QString("%1/%2").arg(downloadsPath, zipName);
QFile file(fPath);
qDebug() << "Writing zip file to " << fPath;
if (!file.open(QIODevice::WriteOnly))
{
this->onInstallError(QString("Error: Could not write to application path: %1").arg(fPath));
if (!file.open(QIODevice::WriteOnly)) {
this->onInstallError(QString("Error: Could not write to download location: %1").arg(fPath));
return;
}
@ -271,14 +288,20 @@ void UpdateDialog::installUpdateMac() {
}
QProcess unzip;
unzip.start("/usr/bin/unzip", {"-n", fPath, "-d", appDir.path()});
unzip.start("/usr/bin/unzip", {"-o", fPath, "-d", appDir.absolutePath()});
unzip.waitForFinished();
m_updatePath = QString("%1.app/Contents/MacOS/feather").arg(appDir.filePath(appName));
if (unzip.exitStatus() != QProcess::NormalExit) {
this->onInstallError(QString("Error: Unable to extract: %1").arg(fPath));
return;
}
m_updatePath = QString("%1/Contents/MacOS/feather").arg(appDir.absolutePath());
qDebug() << "Update path: " << m_updatePath;
file.remove();
this->setStatus("Installation successful. Do you want to restart Feather now?");
this->setStatus(QString("Installation successful: Do you want to restart Feather now?").arg(m_updatePath));
ui->btn_restart->show();
}