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

Refine where to search for the executable defined in the Exec= key

Browse Source
This commit is contained in:
probonopd
2017-02-27 08:14:22 +01:00
parent 4b84a870e6
commit 3894cf17a8
1 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linuxdeployqt/main.cpp
+33 -10
View File
@@ -32,12 +32,13 @@
#include <QRegularExpression> #include <QRegularExpression>
#include <stdlib.h> #include <stdlib.h>
#include <QSettings> #include <QSettings>
#include <QDirIterator>
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
extern QString appBinaryPath; QString appBinaryPath = "";
QString firstArgument = QString::fromLocal8Bit(argv[1]); QString firstArgument = QString::fromLocal8Bit(argv[1]);
@@ -58,16 +59,38 @@ int main(int argc, char **argv)
desktopFile = firstArgument; desktopFile = firstArgument;
desktopIconEntry = settings->value("Desktop Entry/Icon", "r").toString().split(' ').first().trimmed(); desktopIconEntry = settings->value("Desktop Entry/Icon", "r").toString().split(' ').first().trimmed();
qDebug() << "desktopIconEntry:" << desktopIconEntry; qDebug() << "desktopIconEntry:" << desktopIconEntry;
QString candidateBin1 = QDir::cleanPath(QFileInfo(firstArgument).absolutePath() + "/../../bin/" + desktopExecEntry); // FHS-like // QString candidateBin1 = QDir::cleanPath(QFileInfo(firstArgument).absolutePath() + "/../../bin/" + desktopExecEntry); // FHS-like
QString candidateBin2 = QDir::cleanPath(QFileInfo(firstArgument).absolutePath() + desktopExecEntry); // Not FHS-like QString candidateBin2 = QDir::cleanPath(QFileInfo(firstArgument).absolutePath() + desktopExecEntry); // Not FHS-like
if(QFileInfo(candidateBin1).isExecutable()) {
appBinaryPath = candidateBin1; /* Search directory for an executable with the name in the Exec= key */
} else if(QFileInfo(candidateBin2).isExecutable()) { QString directoryToBeSearched;
appBinaryPath = candidateBin1; if(QFileInfo(QDir::cleanPath(QFileInfo(firstArgument).absolutePath() + "/" + desktopExecEntry)).exists()){
directoryToBeSearched = QDir::cleanPath(QFileInfo(firstArgument).absolutePath());
} else if(QFileInfo(QDir::cleanPath(QFileInfo(firstArgument).absolutePath() + "/../../bin/" + desktopExecEntry)).exists()){
directoryToBeSearched = QDir::cleanPath(QFileInfo(firstArgument).absolutePath() + "/../../");
} else { } else {
LogError() << "Could not determine the path to the executable based on the desktop file\n"; directoryToBeSearched = QDir::cleanPath(QFileInfo(firstArgument).absolutePath() + "/../");
return 1;
} }
QDirIterator it(directoryToBeSearched, QDirIterator::Subdirectories);
while (it.hasNext()) {
it.next();
if((it.fileName() == desktopExecEntry) && (it.fileInfo().isExecutable())){
qDebug() << "Found binary from desktop file:" << it.fileInfo().canonicalFilePath();
appBinaryPath = it.fileInfo().canonicalFilePath();
break;
}
}
if(appBinaryPath == ""){
if(QFileInfo(candidateBin2).isExecutable()) {
appBinaryPath = candidateBin2;
} else {
LogError() << "Could not determine the path to the executable based on the desktop file\n";
return 1;
}
}
} else { } else {
appBinaryPath = firstArgument; appBinaryPath = firstArgument;
appBinaryPath = QDir::cleanPath(appBinaryPath); appBinaryPath = QDir::cleanPath(appBinaryPath);
@@ -171,14 +194,14 @@ int main(int argc, char **argv)
/* 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());
if(QFileInfo(destination).exists() == false){ if(QFileInfo(destination).exists() == false){
if (QFile::copy(desktopFile, destination)){ if (QFile::copy(desktopFile, destination)){
qDebug() << "Copied" << desktopFile << "to" << destination; qDebug() << "Copied" << desktopFile << "to" << destination;
} }
} }
if(QFileInfo(destination).isFile() == false){ if(QFileInfo(destination).isFile() == false){
LogError() << destination << "does not exist\n"; LogError() << destination << "does not exist and could not be copied there\n";
return 1; return 1;
} }
} }