revert: "fix(appimage): launch external processes with bundled linker"

Refs: c305ed4
Signed-off-by: Seth Flynn <getchoo@tuta.io>

launcher/DesktopServices.cpp

@@ -2,7 +2,6 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 dada513 <dada513@protonmail.com>
- *  Copyright (C) 2025 Seth Flynn <getchoo@tuta.io>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -76,15 +75,6 @@ bool isFlatpak()
 #endif
 }
 
-bool isSelfContained()
-{
-#ifdef Q_OS_LINUX
-    return QFileInfo(QCoreApplication::applicationFilePath()).fileName().startsWith("ld-linux");
-#else
-    return false;
-#endif
-}
-
 bool isSnap()
 {
 #ifdef Q_OS_LINUX

launcher/DesktopServices.h

@@ -37,11 +37,6 @@ bool openUrl(const QUrl& url);
  */
 bool isFlatpak();
 
-/**
- * Determine whether the launcher is running in a self-contained Linux bundle
- */
-bool isSelfContained();
-
 /**
  * Determine whether the launcher is running in a Snap environment
  */

launcher/FileSystem.cpp

@@ -4,7 +4,6 @@
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *  Copyright (C) 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
- *  Copyright (C) 2025 Seth Flynn <getchoo@tuta.io>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -773,34 +772,6 @@ QString ResolveExecutable(QString path)
     return pathInfo.absoluteFilePath();
 }
 
-std::unique_ptr<QProcess> createProcess(const QString& program, const QStringList& arguments)
-{
-    qDebug() << "Creating process for" << program;
-    auto proc = std::unique_ptr<QProcess>(new QProcess());
-
-#if defined(Q_OS_LINUX)
-    if (DesktopServices::isSelfContained()) {
-        const auto linkerPath = QCoreApplication::applicationFilePath();
-        qDebug() << "Wrapping" << program << "with self-contained linker at" << linkerPath;
-
-        QStringList wrappedArguments;
-        wrappedArguments << "--inhibit-cache" << program;
-        wrappedArguments += arguments;
-
-        proc->setProgram(linkerPath);
-        proc->setArguments(wrappedArguments);
-    } else {
-        proc->setProgram(program);
-        proc->setArguments(arguments);
-    }
-#else
-    proc->setProgram(program);
-    proc->setArguments(arguments);
-#endif
-
-    return proc;
-}
-
 /**
  * Normalize path
  *

launcher/FileSystem.h

@@ -4,7 +4,6 @@
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *  Copyright (C) 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
- *  Copyright (C) 2025 Seth Flynn <getchoo@tuta.io>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -43,13 +42,11 @@
 
 #include <system_error>
 
-#include <QCoreApplication>
 #include <QDir>
 #include <QFlags>
 #include <QLocalServer>
 #include <QObject>
 #include <QPair>
-#include <QProcess>
 #include <QThread>
 
 namespace FS {
@@ -336,14 +333,6 @@ QString pathTruncate(const QString& path, int depth);
  */
 QString ResolveExecutable(QString path);
 
-/**
- * Create a QProcess instance
- *
- * This wrapper is currently only required for wrapping binaries called in
- * self-contained AppImages (like those created by `go-appimage`)
- */
-std::unique_ptr<QProcess> createProcess(const QString& program, const QStringList& arguments);
-
 /**
  * Normalize path
  *

launcher/updater/PrismExternalUpdater.cpp

@@ -26,6 +26,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QMessageBox>
+#include <QProcess>
 #include <QProgressDialog>
 #include <QSettings>
 #include <QTimer>
@@ -34,7 +35,6 @@
 #include "StringUtils.h"
 
 #include "BuildConfig.h"
-#include "FileSystem.h"
 
 #include "ui/dialogs/UpdateAvailableDialog.h"
 
@@ -97,9 +97,14 @@ void PrismExternalUpdater::checkForUpdates(bool triggeredByUser)
     progress.show();
     QCoreApplication::processEvents();
 
+    QProcess proc;
     auto exe_name = QStringLiteral("%1_updater").arg(BuildConfig.LAUNCHER_APP_BINARY_NAME);
 #if defined Q_OS_WIN32
     exe_name.append(".exe");
+
+    auto env = QProcessEnvironment::systemEnvironment();
+    env.insert("__COMPAT_LAYER", "RUNASINVOKER");
+    proc.setProcessEnvironment(env);
 #else
     exe_name = QString("bin/%1").arg(exe_name);
 #endif
@@ -108,21 +113,15 @@ void PrismExternalUpdater::checkForUpdates(bool triggeredByUser)
     if (priv->allowBeta)
         args.append("--pre-release");
 
-    auto proc = FS::createProcess(priv->appDir.absoluteFilePath(exe_name), args);
+    proc.start(priv->appDir.absoluteFilePath(exe_name), args);
-#if defined Q_OS_WIN32
+    auto result_start = proc.waitForStarted(5000);
-    auto env = QProcessEnvironment::systemEnvironment();
-    env.insert("__COMPAT_LAYER", "RUNASINVOKER");
-    proc->setProcessEnvironment(env);
-#endif
-    proc->start(proc->program(), proc->arguments());
-    auto result_start = proc->waitForStarted(5000);
     if (!result_start) {
-        auto err = proc->error();
+        auto err = proc.error();
         qDebug() << "Failed to start updater after 5 seconds."
-                 << "reason:" << err << proc->errorString();
+                 << "reason:" << err << proc.errorString();
         auto msgBox =
             QMessageBox(QMessageBox::Information, tr("Update Check Failed"),
-                        tr("Failed to start after 5 seconds\nReason: %1.").arg(proc->errorString()), QMessageBox::Ok, priv->parent);
+                        tr("Failed to start after 5 seconds\nReason: %1.").arg(proc.errorString()), QMessageBox::Ok, priv->parent);
         msgBox.setMinimumWidth(460);
         msgBox.adjustSize();
         msgBox.exec();
@@ -134,16 +133,16 @@ void PrismExternalUpdater::checkForUpdates(bool triggeredByUser)
     }
     QCoreApplication::processEvents();
 
-    auto result_finished = proc->waitForFinished(60000);
+    auto result_finished = proc.waitForFinished(60000);
     if (!result_finished) {
-        proc->kill();
+        proc.kill();
-        auto err = proc->error();
+        auto err = proc.error();
-        auto output = proc->readAll();
+        auto output = proc.readAll();
         qDebug() << "Updater failed to close after 60 seconds."
-                 << "reason:" << err << proc->errorString();
+                 << "reason:" << err << proc.errorString();
         auto msgBox =
             QMessageBox(QMessageBox::Information, tr("Update Check Failed"),
-                        tr("Updater failed to close 60 seconds\nReason: %1.").arg(proc->errorString()), QMessageBox::Ok, priv->parent);
+                        tr("Updater failed to close 60 seconds\nReason: %1.").arg(proc.errorString()), QMessageBox::Ok, priv->parent);
         msgBox.setDetailedText(output);
         msgBox.setMinimumWidth(460);
         msgBox.adjustSize();
@@ -155,10 +154,10 @@ void PrismExternalUpdater::checkForUpdates(bool triggeredByUser)
         return;
     }
 
-    auto exit_code = proc->exitCode();
+    auto exit_code = proc.exitCode();
 
-    auto std_output = proc->readAllStandardOutput();
+    auto std_output = proc.readAllStandardOutput();
-    auto std_error = proc->readAllStandardError();
+    auto std_error = proc.readAllStandardError();
 
     progress.hide();
     QCoreApplication::processEvents();
@@ -336,9 +335,14 @@ void PrismExternalUpdater::offerUpdate(const QString& version_name, const QStrin
 
 void PrismExternalUpdater::performUpdate(const QString& version_tag)
 {
+    QProcess proc;
     auto exe_name = QStringLiteral("%1_updater").arg(BuildConfig.LAUNCHER_APP_BINARY_NAME);
 #if defined Q_OS_WIN32
     exe_name.append(".exe");
+
+    auto env = QProcessEnvironment::systemEnvironment();
+    env.insert("__COMPAT_LAYER", "RUNASINVOKER");
+    proc.setProcessEnvironment(env);
 #else
     exe_name = QString("bin/%1").arg(exe_name);
 #endif
@@ -347,16 +351,9 @@ void PrismExternalUpdater::performUpdate(const QString& version_tag)
     if (priv->allowBeta)
         args.append("--pre-release");
 
-    auto proc = FS::createProcess(exe_name, args);
+    auto result = proc.startDetached(priv->appDir.absoluteFilePath(exe_name), args);
-#if defined Q_OS_WIN32
-    auto env = QProcessEnvironment::systemEnvironment();
-    env.insert("__COMPAT_LAYER", "RUNASINVOKER");
-    proc->setProcessEnvironment(env);
-#endif
-
-    auto result = proc->startDetached(priv->appDir.absoluteFilePath(exe_name), args);
     if (!result) {
-        qDebug() << "Failed to start updater:" << proc->error() << proc->errorString();
+        qDebug() << "Failed to start updater:" << proc.error() << proc.errorString();
     }
     QCoreApplication::exit();
 }

launcher/updater/prismupdater/PrismUpdater.cpp

@@ -124,19 +124,7 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
     logToConsole = parser.isSet("debug");
 
     QString origCwdPath = QDir::currentPath();
-#if defined(Q_OS_LINUX)
-    // NOTE(@getchoo): In order for `go-appimage` to generate self-contained AppImages, it executes apps from a bundled linker at
-    // <root>/lib64
-    // This is not the path to our actual binary, which we want
-    QString binPath;
-    if (DesktopServices::isSelfContained()) {
-        binPath = FS::PathCombine(applicationDirPath(), "../usr/bin");
-    } else {
-        binPath = applicationDirPath();
-    }
-#else
     QString binPath = applicationDirPath();
-#endif
 
     {  // find data director
        // Root path is used for updates and portable data
@@ -819,16 +807,13 @@ QFileInfo PrismUpdaterApp::downloadAsset(const GitHubReleaseAsset& asset)
 bool PrismUpdaterApp::callAppImageUpdate()
 {
     auto appimage_path = QProcessEnvironment::systemEnvironment().value(QStringLiteral("APPIMAGE"));
+    QProcess proc = QProcess();
     qDebug() << "Calling: AppImageUpdate" << appimage_path;
-    const auto program = FS::PathCombine(m_rootPath, "bin", "AppImageUpdate.AppImage");
+    proc.setProgram(FS::PathCombine(m_rootPath, "bin", "AppImageUpdate.AppImage"));
-    auto proc = FS::createProcess(program, { appimage_path });
+    proc.setArguments({ appimage_path });
-    if (!proc) {
+    auto result = proc.startDetached();
-        qCritical() << "Unable to create process:" << program;
-        return false;
-    }
-    auto result = proc->startDetached();
     if (!result)
-        qDebug() << "Failed to start AppImageUpdate reason:" << proc->errorString();
+        qDebug() << "Failed to start AppImageUpdate reason:" << proc.errorString();
     return result;
 }