Merge pull request #22 from opendesktop/develop

Develop

app/src/main.cpp

@@ -14,11 +14,11 @@
 int main(int argc, char *argv[])
 {
     // Init
-    auto envPath = QGuiApplication::applicationDirPath() + ":" + QString::fromLocal8Bit(qgetenv("PATH").constData());
-    qputenv("PATH", envPath.toUtf8().constData());
-
     QGuiApplication app(argc, argv); // This is backend program, but need GUI module
 
+    auto envPath = app.applicationDirPath() + ":" + QString::fromLocal8Bit(qgetenv("PATH").constData());
+    qputenv("PATH", envPath.toUtf8().constData());
+
     auto *configHandler = new ConfigHandler(&app);
     auto appConfigApplication = configHandler->getAppConfigApplication();
 

pkg/appimage/appimage.sh

@@ -21,7 +21,6 @@ install -D -m 755 /lib/x86_64-linux-gnu/libz.so.1 ${PKGNAME}.AppDir/usr/lib/libz
 
 install -D -m 755 /usr/bin/unzip ${PKGNAME}.AppDir/usr/bin/unzip
 install -D -m 755 /usr/lib/p7zip/7zr ${PKGNAME}.AppDir/usr/bin/7z
-install -D -m 755 /usr/bin/unrar ${PKGNAME}.AppDir/usr/bin/unrar
 
 ./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -appimage
 

scripts/build-docker.sh

@@ -42,7 +42,7 @@ build_appimage() {
     #apt -y install build-essential qt5-default libqt5websockets5-dev
     #apt -y install cmake libssl-dev libcurl4-gnutls-dev libxpm-dev
     apt -y install libssl1.0.0 zlib1g
-    apt -y install unzip p7zip unrar
+    apt -y install unzip p7zip
 
     add-apt-repository -y ppa:beineri/opt-qt593-trusty
     echo 'deb http://download.opensuse.org/repositories/home:/TheAssassin:/AppImageLibraries/xUbuntu_14.04/ /' > /etc/apt/sources.list.d/curl-httponly.list