From 600fc20ea73ee937a402a2bb6b3663d93fcc1d4b Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 15 Dec 2018 11:12:48 +0000 Subject: [PATCH] Keep existing AppRun (#335) Keep existing AppRun, closes #159 --- tests/tests-ci.sh | 4 ++-- tools/linuxdeployqt/main.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/tests-ci.sh b/tests/tests-ci.sh index db45428..60a6a6e 100755 --- a/tests/tests-ci.sh +++ b/tests/tests-ci.sh @@ -16,8 +16,8 @@ cp -r /usr/local/lib/appimagekit linuxdeployqt.AppDir/usr/lib/ find linuxdeployqt.AppDir/ export VERSION=continuous if [ ! -z $TRAVIS_TAG ] ; then export VERSION=$TRAVIS_TAG ; fi -./bin/linuxdeployqt linuxdeployqt.AppDir/usr/bin/desktop-file-validate -verbose=3 -bundle-non-qt-libs -./bin/linuxdeployqt linuxdeployqt.AppDir/linuxdeployqt.desktop -verbose=3 -appimage +./bin/linuxdeployqt linuxdeployqt.AppDir/linuxdeployqt.desktop -verbose=3 -appimage \ + -executable=linuxdeployqt.AppDir/usr/bin/desktop-file-validate ls -lh find *.AppDir xpra start :99 diff --git a/tools/linuxdeployqt/main.cpp b/tools/linuxdeployqt/main.cpp index fe932ce..a9cedba 100644 --- a/tools/linuxdeployqt/main.cpp +++ b/tools/linuxdeployqt/main.cpp @@ -260,11 +260,11 @@ int main(int argc, char **argv) QFile appRun(appDirPath + "/AppRun"); if(appRun.exists()){ - appRun.remove(); + qDebug() << "Keeping existing AppRun"; + } else { + QFile::link(relativeBinPath, appDirPath + "/AppRun"); } - QFile::link(relativeBinPath, appDirPath + "/AppRun"); - /* Copy the desktop file in place, into the top level of the AppDir */ if(desktopFile != ""){ QString destination = QDir::cleanPath(appDirPath + "/" + QFileInfo(desktopFile).fileName());