SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@851 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-18 20:55:34 +00:00
parent 4f97c5b21a
commit 8ac2cce3f8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deploy_tool/main.cpp
View File

@@ -281,7 +281,7 @@ void procQt() {
void procDpkg(const PIString & l) { void procDpkg(const PIString & l) {
PIString vs, cmd = dpkg + " -S " + l; PIString vs, cmd = dpkg + " -S " + l + " 2> /dev/null";
FILE * fp = popen(cmd.dataAscii(), "r"); FILE * fp = popen(cmd.dataAscii(), "r");
if (fp) { if (fp) {
const int sz = 256; const int sz = 256;
@@ -343,6 +343,8 @@ int main(int argc, char * argv[]) {
objdump = cli.argumentValue("Wobjdump"); objdump = cli.argumentValue("Wobjdump");
otool = cli.argumentValue("Motool"); otool = cli.argumentValue("Motool");
dpkg = cli.argumentValue("Dpkg"); dpkg = cli.argumentValue("Dpkg");
if (dpkg.isEmpty())
dpkg = "/usr/bin/dpkg";
out_plugins_dir = out_dir + "plugins/"; out_plugins_dir = out_dir + "plugins/";
if (!cli.argumentValue("pqt_out_plugins").isEmpty()) { if (!cli.argumentValue("pqt_out_plugins").isEmpty()) {
out_plugins_dir = cli.argumentValue("pqt_out_plugins"); out_plugins_dir = cli.argumentValue("pqt_out_plugins");