Keep existing AppRun (#335)

Keep existing AppRun, closes #159
probonopd · Dec 15, 2018 · 600fc20 · 600fc20
1 parent 0dd02e3
commit 600fc20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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());