TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Keep existing AppRun (#335)

Browse Source 
Keep existing AppRun, closes #159
This commit is contained in:
probonopd
2018-12-15 11:12:48 +00:00
committed by GitHub
parent 0dd02e3c3d
commit 600fc20ea7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/tests-ci.sh
+2 -2
View File
@@ -16,8 +16,8 @@ cp -r /usr/local/lib/appimagekit linuxdeployqt.AppDir/usr/lib/
find linuxdeployqt.AppDir/ find linuxdeployqt.AppDir/
export VERSION=continuous export VERSION=continuous
if [ ! -z $TRAVIS_TAG ] ; then export VERSION=$TRAVIS_TAG ; fi 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 ls -lh
find *.AppDir find *.AppDir
xpra start :99 xpra start :99
tools/linuxdeployqt/main.cpp
+3 -3
View File
@@ -260,11 +260,11 @@ int main(int argc, char **argv)
QFile appRun(appDirPath + "/AppRun"); QFile appRun(appDirPath + "/AppRun");
if(appRun.exists()){ 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 */ /* Copy the desktop file in place, into the top level of the AppDir */
if(desktopFile != ""){ if(desktopFile != ""){
QString destination = QDir::cleanPath(appDirPath + "/" + QFileInfo(desktopFile).fileName()); QString destination = QDir::cleanPath(appDirPath + "/" + QFileInfo(desktopFile).fileName());