This commit is contained in:
arcan1s 2014-11-17 17:38:02 +03:00
parent 3193de1a85
commit f7b7d5b6b4
3 changed files with 3 additions and 9 deletions

View File

@ -856,7 +856,7 @@ QList<ExtScript *> AwesomeWidget::initScripts()
for (int i=0; i<dirs.count(); i++) { for (int i=0; i<dirs.count(); i++) {
QStringList files = QDir(dirs[i]).entryList(QDir::Files, QDir::Name); QStringList files = QDir(dirs[i]).entryList(QDir::Files, QDir::Name);
for (int j=0; j<files.count(); j++) { for (int j=0; j<files.count(); j++) {
if (files[j].endsWith(QString(".conf"))) continue; if (!files[j].endsWith(QString(".desktop"))) continue;
if (names.contains(files[j])) continue; if (names.contains(files[j])) continue;
if (debug) qDebug() << PDEBUG << ":" << "Found file" << files[j] << "in" << dirs[i]; if (debug) qDebug() << PDEBUG << ":" << "Found file" << files[j] << "in" << dirs[i];
names.append(files[j]); names.append(files[j]);

View File

@ -248,13 +248,7 @@ ExtScript::ScriptData ExtScript::run(const int time)
QStringList cmdList; QStringList cmdList;
if (!_prefix.isEmpty()) if (!_prefix.isEmpty())
cmdList.append(_prefix); cmdList.append(_prefix);
QString fullPath = fileName; cmdList.append(_exec);
for (int i=0; i<dirs.count(); i++) {
if (!QDir(dirs[i]).entryList(QDir::Files).contains(fileName)) continue;
fullPath = dirs[i] + QDir::separator() + fileName;
break;
}
cmdList.append(fullPath);
if (debug) qDebug() << PDEBUG << ":" << "cmd" << cmdList.join(QChar(' ')); if (debug) qDebug() << PDEBUG << ":" << "cmd" << cmdList.join(QChar(' '));
TaskResult process = runTask(cmdList.join(QChar(' '))); TaskResult process = runTask(cmdList.join(QChar(' ')));
if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode; if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;

View File

@ -126,7 +126,7 @@ void ExtendedSysMon::initScripts()
for (int i=0; i<dirs.count(); i++) { for (int i=0; i<dirs.count(); i++) {
QStringList files = QDir(dirs[i]).entryList(QDir::Files, QDir::Name); QStringList files = QDir(dirs[i]).entryList(QDir::Files, QDir::Name);
for (int j=0; j<files.count(); j++) { for (int j=0; j<files.count(); j++) {
if (files[j].endsWith(QString(".conf"))) continue; if (!files[j].endsWith(QString(".desktop"))) continue;
if (names.contains(files[j])) continue; if (names.contains(files[j])) continue;
if (debug) qDebug() << PDEBUG << ":" << "Found file" << files[j] << "in" << dirs[i]; if (debug) qDebug() << PDEBUG << ":" << "Found file" << files[j] << "in" << dirs[i];
names.append(files[j]); names.append(files[j]);