pacnpal/citron
1
0
Fork 0
mirror of https://git.eden-emu.dev/archive/citron synced 2026-04-18 02:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Update Linux for CLI

Browse Source 
Signed-off-by: Collecting <collecting@noreply.localhost>
This commit is contained in:
Collecting
2025-12-26 03:58:34 +00:00
parent 9b77d94c59
commit 549e7c863f
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/citron/updater/updater_service.cpp
View File

@@ -194,24 +194,27 @@ void UpdaterService::OnDownloadFinished() {
#elif defined(__linux__) #elif defined(__linux__)
const char* appimage_env = qgetenv("APPIMAGE").constData(); const char* appimage_env = qgetenv("APPIMAGE").constData();
if (!appimage_env || strlen(appimage_env) == 0) { if (!appimage_env || strlen(appimage_env) == 0) {
emit UpdateError(QStringLiteral("Not running from an AppImage. Manual update required.")); emit UpdateError(QStringLiteral("Not running from an AppImage. Check your PATH."));
update_in_progress.store(false); update_in_progress.store(false);
return; return;
} }
std::filesystem::path original_path = appimage_env; std::filesystem::path original_path = appimage_env;
std::filesystem::path new_path = original_path.string() + ".new";
// 1. BACKUP LOGIC
if (UISettings::values.updater_enable_backups.GetValue()) { if (UISettings::values.updater_enable_backups.GetValue()) {
std::filesystem::path backup_dir = UISettings::values.updater_backup_path.GetValue().empty() ? std::filesystem::path backup_dir = UISettings::values.updater_backup_path.GetValue().empty() ?
(original_path.parent_path() / "backup") : std::filesystem::path(UISettings::values.updater_backup_path.GetValue()); (original_path.parent_path() / "backup") : std::filesystem::path(UISettings::values.updater_backup_path.GetValue());
std::error_code ec; std::error_code ec;
std::filesystem::create_directories(backup_dir, ec); std::filesystem::create_directories(backup_dir, ec);
std::filesystem::copy_file(original_path, backup_dir / ("citron-backup-" + GetCurrentVersion() + ".AppImage"), std::filesystem::path b_file = backup_dir / ("citron-backup-" + GetCurrentVersion() + ".AppImage");
std::filesystem::copy_options::overwrite_existing, ec); std::filesystem::copy_file(original_path, b_file, std::filesystem::copy_options::overwrite_existing, ec);
if (ec) LOG_ERROR(Frontend, "Backup failed: {}", ec.message());
} }
std::filesystem::path new_path = original_path.string() + ".new"; // 2. SAVE NEW DATA
QFile n_file(QString::fromStdString(new_path.string())); QFile n_file(QString::fromStdString(new_path.string()));
if (n_file.open(QIODevice::WriteOnly)) { if (n_file.open(QIODevice::WriteOnly)) {
n_file.write(data); n_file.write(data);
@@ -222,15 +225,16 @@ void UpdaterService::OnDownloadFinished() {
QFileDevice::ReadOther|QFileDevice::ExeOther); QFileDevice::ReadOther|QFileDevice::ExeOther);
std::error_code ec; std::error_code ec;
// TRY RENAME: If this fails because the file is busy, we will fall back to staging.
std::filesystem::rename(new_path, original_path, ec); std::filesystem::rename(new_path, original_path, ec);
if (ec) { if (ec) {
emit UpdateError(QString::fromStdString("Failed to replace AppImage: " + ec.message())); LOG_WARNING(Frontend, "Direct replace failed (file busy). Staging update for next launch.");
update_in_progress.store(false); // We leave .new there and let the next launch handle it, or prompt user.
return; emit UpdateCompleted(UpdateResult::Success, QStringLiteral("Update downloaded. Please delete the old AppImage and rename the .new file."));
} else {
emit UpdateCompleted(UpdateResult::Success, QStringLiteral("Success"));
} }
} }
emit UpdateCompleted(UpdateResult::Success, QStringLiteral("Success"));
update_in_progress.store(false); update_in_progress.store(false);
#endif #endif
} }
@@ -325,26 +329,26 @@ bool UpdaterService::HasStagedUpdate(const std::filesystem::path& p) {
bool UpdaterService::ApplyStagedUpdate(const std::filesystem::path& p) { bool UpdaterService::ApplyStagedUpdate(const std::filesystem::path& p) {
#ifdef _WIN32 #ifdef _WIN32
try { try {
std::filesystem::path s = p / "update_staging"; std::filesystem::path s = p / "update_staging";
if (!std::filesystem::exists(s)) return false; if (!std::filesystem::exists(s)) return false;
std::filesystem::path b = p / "backup_before_update"; std::filesystem::path b = p / "backup_before_update";
std::filesystem::create_directories(b); std::filesystem::create_directories(b);
for (const auto& e : std::filesystem::recursive_directory_iterator(s)) { for (const auto& e : std::filesystem::recursive_directory_iterator(s)) {
if (e.is_regular_file()) { if (e.is_regular_file()) {
std::filesystem::path rel = std::filesystem::relative(e.path(), s); std::filesystem::path rel = std::filesystem::relative(e.path(), s);
std::filesystem::path dest = p / rel; std::filesystem::path dest = p / rel;
if (std::filesystem::exists(dest)) { if (std::filesystem::exists(dest)) {
std::filesystem::create_directories((b / rel).parent_path()); std::filesystem::create_directories((b / rel).parent_path());
std::filesystem::copy_file(dest, b / rel, std::filesystem::copy_options::overwrite_existing); std::filesystem::copy_file(dest, b / rel, std::filesystem::copy_options::overwrite_existing);
} }
std::filesystem::create_directories(dest.parent_path()); std::filesystem::create_directories(dest.parent_path());
std::filesystem::copy_file(e.path(), dest, std::filesystem::copy_options::overwrite_existing); std::filesystem::copy_file(e.path(), dest, std::filesystem::copy_options::overwrite_existing);
} }
} }
std::error_code ec; std::error_code ec;
std::filesystem::remove_all(s, ec); std::filesystem::remove_all(s, ec);
return true; return true;
} catch (...) { return false; } } catch (...) { return false; }
#else #else