From b0093484346fdf15337af8cddd687d377da759ce Mon Sep 17 00:00:00 2001
From: Jan Darmochwal
Date: Mon, 1 Nov 2010 16:57:08 +0100
Subject: Added global vars, version number in globals.h

---
 src/main.cpp | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 54487d8..fbb3f67 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -27,8 +27,6 @@ int main(int argc, char *argv[]) {
     translator.load(":" + QLocale::system().name());
     a.installTranslator(&translator);
 
-    std::string version = "0.0.13";
-
     CommandLineOptions cmdOptions(argc, argv);
 
     std::string usage(a.translate(
@@ -54,7 +52,7 @@ int main(int argc, char *argv[]) {
     }
 
     if (cmdOptions.contains("version")) {
-        std::cout << version;
+        std::cout << "vmchooser " << VMCHOOSER_VERSION << std::endl;
         return EXIT_SUCCESS;
     }
 
@@ -96,11 +94,6 @@ int main(int argc, char *argv[]) {
     //   user vmchooser.conf or
     //   globel vmchooser.conf
     QString confFile;
-    QString userConfFile(QDir::homePath() + "/" +
-                         VMCHOOSER_USER_PATH + "/" +
-                         VMCHOOSER_CONF_FILE);
-    QString globalConfFile(QString(VMCHOOSER_ETC_BASE_PATH) + "/" +
-                           VMCHOOSER_CONF_FILE);
     if (cmdOptions.contains("config")) {
         confFile = cmdOptions.value("config");
     } else if (QFileInfo(userConfFile).exists()) {
@@ -120,23 +113,17 @@ int main(int argc, char *argv[]) {
         defaultSession = readSessionName();
     }
 
-    QString vSessionXmlPath;
     if (cmdOptions.contains("path")) {
-        vSessionXmlPath = cmdOptions.value("path");
+        vSessionPath = cmdOptions.value("path");
     } else if (settings.contains("path")) {
-        vSessionXmlPath = settings.value("path").toString();
-    } else {
-        vSessionXmlPath = VMCHOOSER_VMPATH;
-    }
+        vSessionPath = settings.value("path").toString();
+    }  // else keep default path
 
-    QString xSessionPath;
     if (cmdOptions.contains("xpath")) {
         xSessionPath = cmdOptions.value("xpath");
     } else if (settings.contains("xpath")) {
         xSessionPath = settings.value("xpath").toString();
-    } else {
-        xSessionPath = VMCHOOSER_X_SESSIONS_PATH;
-    }
+    }  // else keep default path
 
     QString size;
     if (cmdOptions.contains("size")) {
@@ -164,7 +151,7 @@ int main(int argc, char *argv[]) {
 
     /* read session files */
     QList<Session*> xsessions(XSession::readSessions(xSessionPath));
-    QList<Session*> vsessions(VSession::readXmlDir(vSessionXmlPath));
+    QList<Session*> vsessions(VSession::readXmlDir(vSessionPath));
 
     Dialog w;
     w.resize(width, height);
@@ -180,6 +167,14 @@ int main(int argc, char *argv[]) {
         w.addItems(xsessions, a.translate("Dialog", "X Sessions"));
     }
     if (vsessions.size()) {
+        if (!(QFile::permissions(runVmScript) & QFile::ExeUser)) {
+            std::cerr << a.translate(
+                    "Console",
+                    "vmchooser: external script %1 is not executable")
+                    .arg(runVmScript).toUtf8().data()
+                    << std::endl;
+            return EXIT_FAILURE;
+        }
         qSort(vsessions.begin(), vsessions.end(), myLessThan);
         w.addItems(vsessions, a.translate("Dialog", "Virtual Sessions"));
     }
-- 
cgit v1.2.3-55-g7522