diff options
author | Johann Latocha | 2010-07-10 00:11:47 +0200 |
---|---|---|
committer | Johann Latocha | 2010-07-10 00:11:47 +0200 |
commit | d2d403a8dec0f65bb3665c2bd2dab69456cdee42 (patch) | |
tree | a84301974f490b80902a402e9b7c3c3855ebf010 /src/pvsDaemon.cpp | |
parent | first commit to test git (diff) | |
download | pvs-d2d403a8dec0f65bb3665c2bd2dab69456cdee42.tar.gz pvs-d2d403a8dec0f65bb3665c2bd2dab69456cdee42.tar.xz pvs-d2d403a8dec0f65bb3665c2bd2dab69456cdee42.zip |
Revoke Fabians changes.
Diffstat (limited to 'src/pvsDaemon.cpp')
-rw-r--r-- | src/pvsDaemon.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/pvsDaemon.cpp b/src/pvsDaemon.cpp index 961e0f3..e87bfe7 100644 --- a/src/pvsDaemon.cpp +++ b/src/pvsDaemon.cpp @@ -66,11 +66,13 @@ int main(int argc, char** argv) { int frequency = 5; int port = -1; - QString homeDir("/home/"); - QString scriptPath = homeDir; - scriptPath.append(getUserName().append(QString("/.pvs/pvs-vncsrv"))); - QString scriptName; - scriptName = getFilenameFromPath(scriptPath); + + QFileInfo script; + script.setFile("/usr/bin/pvs-vncsrv"); + if (!script.exists()) + script.setFile("/usr/local/bin/pvs-vncsrv"); + if (!script.exists()) + script.setFile("/home/" + getUserName() + "/.pvs/pvs-vncsrv"); QCoreApplication app(argc, argv); app.setOrganizationName("openslx"); @@ -259,8 +261,7 @@ int main(int argc, char** argv) { if (option_index + 1 < argc) { - scriptPath = QString(argv[option_index + 1]); - scriptName = getFilenameFromPath(scriptPath); + script.setFile(QString(argv[option_index + 1])); option_index++; continue; } @@ -347,13 +348,13 @@ int main(int argc, char** argv) if (port <= 0) port = SERVER_PORT_INT; ConsoleLog writeLine(QString("TCP-Port: ").append(int2String(port))); - mainClient->setScriptPath(scriptPath); - ConsoleLog writeLine(QString("VNCScriptPath: ").append(scriptPath)); + mainClient->setScriptPath(script.filePath()); + ConsoleLog writeLine(QString("VNCScriptPath: ").append(script.filePath())); createPolicyDir(); createPolicyFiles(); // long int gr = 0; - mainClient->setScriptPath(scriptPath); + mainClient->setScriptPath(script.filePath()); app.exec(); delete mainClient; |