renamed-executable

Author: illwieckz

linux.cpp

@@ -115,17 +115,9 @@ void migrateHomePath()
 QString relativeInstallPath()
 {
     QFileInfo applicationFileInfo(QCoreApplication::applicationFilePath());
-    QString applicationDirPath = applicationFileInfo.absolutePath();
-    QString triggerFilePath = applicationDirPath + "/.relative-installation";
-    QFile triggerFile(triggerFilePath);
-    if (triggerFile.exists()) {
-        if(!triggerFile.open(QIODevice::ReadOnly)) {
-            qFatal("Cannot read %s", qPrintable(triggerFilePath));
-        }
-        QTextStream content(&triggerFile);
-        if (content.readLine() == "5930bb66-bd68-4f30-9bb1-dc760253d406") {
-           return applicationDirPath;
-        }
+    if (applicationFileInfo.fileName().toLower().startsWith("relative"))
+    {
+        return applicationFileInfo.absolutePath();
     }
     return QString();
 }
@@ -186,7 +178,17 @@ bool installShortcuts()
         qDebug() << "missing resource" << desktopFileName;
         return false;
     }
-    QString desktopStr = QString(desktopFile.readAll().data()).arg(settings.installPath());
+
+	QString name = "updater";
+
+	if (!relativeInstallPath().isNull()) {
+	    QFileInfo applicationFileInfo(QCoreApplication::applicationFilePath());
+	    name = applicationFileInfo.fileName();
+	}
+
+	QString path = settings.installPath() + QDir::separator() + name;
+
+    QString desktopStr = QString(desktopFile.readAll().data()).arg(path);
     {
         QFile outputFile(desktopDir.filePath(desktopFileName));
         if (!outputFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
@@ -222,7 +224,15 @@ bool installShortcuts()
 
 bool installUpdater(const QString& installPath) {
     QFileInfo src(QCoreApplication::applicationFilePath());
-    QFileInfo dest(installPath + QDir::separator() + "updater");
+
+    if (!relativeInstallPath().isNull())
+    {
+        qDebug() << "Updater is in relative install location";
+        return true;
+    }
+
+	QFileInfo dest(installPath + QDir::separator() + "updater");
+
     if (src == dest) {
         qDebug() << "Updater already in install location";
         return true;
@@ -322,7 +332,7 @@ QSettings* makePersistentSettings(QObject* parent)
     // the updater if there is already one there.
     QString relative = relativeInstallPath();
     if (!relative.isNull()) {
-        return new QSettings(relative + "/updater.conf", QSettings::NativeFormat, parent);
+        return new QSettings(relative + QDir::separator() + "updater.conf", QSettings::NativeFormat, parent);
     }
 
     // Standard installation, settings are stored

resources/net.unvanquished.Unvanquished.desktop

@@ -5,8 +5,8 @@ Comment=FPS/RTS Game - Aliens vs. Humans
 Icon=unvanquished
 Terminal=false
 Type=Application
-Exec="%1/updater" -- %u
-TryExec=%1/updater
+Exec="%1" -- %u
+TryExec=%1
 MimeType=x-scheme-handler/unv
 Categories=Game;ActionGame;StrategyGame;
 StartupWMClass=net.unvanquished.Unvanquished