diff options
Diffstat (limited to 'src/vsession.cpp')
| -rw-r--r-- | src/vsession.cpp | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/vsession.cpp b/src/vsession.cpp index a49105d..d3c0296 100644 --- a/src/vsession.cpp +++ b/src/vsession.cpp @@ -182,7 +182,7 @@ void VSession::addUserAndHostname() { QString image(this->getAttribute("image_name")); if (QFileInfo(image).isRelative()) { // make path to image absolute - this->addNodeWithAttribute("image_name", this->baseDirPath_ + image); + this->addNodeWithAttribute("image_name", this->baseDirPath_ + "/" + image); } // insert computername as the first child of <eintrag> @@ -204,10 +204,8 @@ bool VSession::run() const { VSession session = *this; - QString etcpath(VMCHOOSER_ETC_BASE_PATH); - // TODO: put script names in (global?) constants - session.addPrinters(etcpath + "printer.sh"); - session.addScanners(etcpath + "scanner.sh"); + session.addPrinters(printerScript); + session.addScanners(scannerScript); session.addUserAndHostname(); @@ -223,14 +221,8 @@ bool VSession::run() const { tmpfile.close(); tmpfile.setAutoRemove(false); - // TODO: put script name in constant - // TODO: check if run-virt.sh exists - QString runVmScript(QString(VMCHOOSER_BIN_PATH) + "run-virt.sh"); - if (QProcess::startDetached(runVmScript, QStringList(tmpfile.fileName()))) { - // TODO: save session - return true; - } - return false; + return QProcess::startDetached(runVmScript, + QStringList(tmpfile.fileName())); } QList<Session*> VSession::readXmlFile(const QString& filepath) { @@ -273,12 +265,11 @@ QList<Session*> VSession::readXmlFile(const QString& filepath) { QList<Session*> VSession::readXmlDir(const QString& path) { QList<Session*> retval; - QDir appDir(QApplication::applicationDirPath()); - if (QFile::exists(appDir.filePath(filterscript))) { - // run filterscript + if (QFile::exists(filterScript)) { + // run filterScript // treat every output line as a filename and read it QProcess myFilterScript; - myFilterScript.start(appDir.filePath(filterscript), QStringList(path), + myFilterScript.start(filterScript, QStringList(path), QIODevice::ReadOnly); while (!myFilterScript.atEnd()) { QString filename(myFilterScript.readLine()); |