better AppImage support

Author: ddmitov

doc/REQUIREMENTS.md

@@ -28,7 +28,7 @@ qmake -qt=qt5
 make
 ```
 
-Please note that PEB builds using the ``QtWebKit`` web engine are single-process applications consuming less memory than PEB builds using the ``QtWebEngine``, which are multiprocess applications.  
+Please note that PEB builds using the ``QtWebKit`` web engine are single-process applications consuming less memory than PEB builds using the ``QtWebEngine`` which are multiprocess applications.  
 
 ## Compile-Time Settings
 All compile-time settings require editing the ``src/peb.pro`` project file according to the following instructions.  

src/main.cpp

@@ -116,6 +116,18 @@ int main(int argc, char **argv)
 
     QString browserDirectory = executableDirectory.absolutePath().toLatin1();
 
+#ifdef Q_OS_LINUX
+    QByteArray appImageEnvVariable = qgetenv("APPIMAGE");
+
+    if (appImageEnvVariable.length() > 0) {
+        QFileInfo appImageFileInfo =
+                QFileInfo(QString::fromLatin1(appImageEnvVariable));
+        QString appImageDirectory = appImageFileInfo.path();
+
+        browserDirectory = appImageDirectory;
+    }
+#endif
+
     // ==============================
     // Perl directory:
     // ==============================
@@ -163,23 +175,6 @@ int main(int argc, char **argv)
 
     QString resourcesDirectory = browserDirectory + "/resources";
 
-#ifdef Q_OS_LINUX
-    QByteArray appImageEnvVariable = qgetenv("APPIMAGE");
-    QString appImageResourcesDirectory;
-
-    if (appImageEnvVariable.length() > 0) {
-        QFileInfo appImageFileInfo =
-                QFileInfo(QString::fromLatin1(appImageEnvVariable));
-
-        QString appImageDirectory = appImageFileInfo.path();
-        QString appImageName = appImageFileInfo.baseName();
-
-        appImageResourcesDirectory =
-                appImageDirectory + "/"
-                + appImageName + "-resources";
-    }
-#endif
-
     // ==============================
     // Application directory:
     // ==============================
@@ -192,18 +187,6 @@ int main(int argc, char **argv)
     // ==============================
     QString dataDirName = resourcesDirectory + "/data";
 
-#ifdef Q_OS_LINUX
-    if (appImageEnvVariable.length() > 0) {
-        dataDirName = appImageResourcesDirectory + "/data";
-
-        QDir dataDir(dataDirName);
-
-        if (!dataDir.exists()) {
-            dataDir.mkpath(dataDirName);
-        }
-    }
-#endif
-
     qputenv("PEB_DATA_DIR", dataDirName.toLatin1());
 
     // ==============================
@@ -233,12 +216,6 @@ int main(int argc, char **argv)
 
     QString logDirFullPath = resourcesDirectory + "/logs";
 
-#ifdef Q_OS_LINUX
-    if (appImageEnvVariable.length() > 0) {
-        logDirFullPath = appImageResourcesDirectory + "/logs";
-    }
-#endif
-
     QDir logDir(logDirFullPath);
     if (logDir.exists()) {
         application.setProperty("logDirFullPath", logDirFullPath);