diff --git a/app/src/main.cpp b/app/src/main.cpp index 8dca2326d7a819830d57a0aff714f57922c17f18..bee9a2e5d01acb0122b332cb358a476e252188da 100644 --- a/app/src/main.cpp +++ b/app/src/main.cpp @@ -14,6 +14,9 @@ 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 *configHandler = new ConfigHandler(&app); diff --git a/pkg/appimage/appimage.sh b/pkg/appimage/appimage.sh index 2e31442b2909a33626a06d8151161edbf6305db1..6b2c5c3cda163f6613e250fd362cecac24ba96bb 100644 --- a/pkg/appimage/appimage.sh +++ b/pkg/appimage/appimage.sh @@ -21,7 +21,7 @@ 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-free ${PKGNAME}.AppDir/usr/bin/unrar +install -D -m 755 /usr/bin/unrar ${PKGNAME}.AppDir/usr/bin/unrar ./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -appimage diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh index d5125da1689b815d7ce2111d70ca5ee47b30ba52..ece63fcdac53c40741f904335e4347b42442a3b5 100644 --- a/scripts/build-docker.sh +++ b/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-free + apt -y install unzip p7zip unrar 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