Browse Source

Keep existing AppRun (#335)

Keep existing AppRun, closes #159
master
probonopd 6 years ago
committed by GitHub
parent
commit
600fc20ea7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      tests/tests-ci.sh
  2. 6
      tools/linuxdeployqt/main.cpp

4
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

6
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());

Loading…
Cancel
Save