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

Merge pull request #186 from probonopd/fix/multiarch

Browse Source 
Fix #184 segfault on multiarch systems
This commit is contained in:
TheAssassin
2017-11-17 20:07:08 +01:00
committed by GitHub
parent 072f773795 717eebcaf7
commit f245c65358
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/linuxdeployqt/shared.cpp
+7 -7
View File
@@ -291,7 +291,7 @@ bool copyCopyrightFile(QString libPath){
} }
QString dpkgQueryPath; QString dpkgQueryPath;
dpkgQueryPath = QStandardPaths::findExecutable("dpkg"); dpkgQueryPath = QStandardPaths::findExecutable("dpkg-query");
if(dpkgQueryPath == ""){ if(dpkgQueryPath == ""){
LogNormal() << "dpkg-query not found, hence not deploying copyright files"; LogNormal() << "dpkg-query not found, hence not deploying copyright files";
return false; return false;
@@ -301,19 +301,17 @@ bool copyCopyrightFile(QString libPath){
/* Find out which package the file being deployed belongs to */ /* Find out which package the file being deployed belongs to */
QString program = "dpkg";
QStringList arguments; QStringList arguments;
arguments << "-S" << libPath; arguments << "-S" << libPath;
QProcess *myProcess = new QProcess(); QProcess *myProcess = new QProcess();
myProcess->start(program, arguments); myProcess->start(dpkgPath, arguments);
myProcess->waitForFinished(); myProcess->waitForFinished();
QString strOut = myProcess->readAllStandardOutput().split(':')[0]; QString strOut = myProcess->readAllStandardOutput().split(':')[0];
if(strOut == "") return false; if(strOut == "") return false;
/* Find out the copyright file in that package */ /* Find out the copyright file in that package */
program = "dpkg-query";
arguments << "-L" << strOut; arguments << "-L" << strOut;
myProcess->start(program, arguments); myProcess->start(dpkgQueryPath, arguments);
myProcess->waitForFinished(); myProcess->waitForFinished();
strOut = myProcess->readAllStandardOutput(); strOut = myProcess->readAllStandardOutput();
@@ -321,8 +319,10 @@ bool copyCopyrightFile(QString libPath){
foreach (QString outputLine, outputLines) { foreach (QString outputLine, outputLines) {
if((outputLine.contains("usr/share/doc")) && (outputLine.contains("/copyright")) && (outputLine.contains(" "))){ if((outputLine.contains("usr/share/doc")) && (outputLine.contains("/copyright")) && (outputLine.contains(" "))){
copyrightFilePath = outputLine.split(' ')[1]; // copyrightFilePath = outputLine.split(' ')[1]; // This is not working on multiarch systems; see https://github.com/probonopd/linuxdeployqt/issues/184#issuecomment-345293540
break; QStringList parts = outputLine.split(' ');
copyrightFilePath = parts[parts.size() - 1]; // Grab last element
break;
} }
} }