Add Quassel::scriptDirPaths() to get a list of locations we look for scripts in

This includes a subdirectory named scripts/ in the configdir and in all dataDirPaths(),
where configdir/scripts/ takes precedence to allow for overriding the system installation.

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 50651bd..08652ab 100644 (file)
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -336,6 +336,13 @@ QString Quassel::findDataFilePath(const QString &fileName) {
   return QString();
 }
 
   return QString();
 }
 

+QStringList Quassel::scriptDirPaths() {
+  QStringList res(configDirPath() + "scripts/");
+  foreach(QString path, dataDirPaths())
+    res << path + "scripts/";
+  return res;
+}
+

 QString Quassel::translationDirPath() {
   if(_translationDirPath.isEmpty()) {
     // We support only one translation dir; fallback mechanisms wouldn't work else.
 QString Quassel::translationDirPath() {
   if(_translationDirPath.isEmpty()) {
     // We support only one translation dir; fallback mechanisms wouldn't work else.

diff --git a/src/common/quassel.h b/src/common/quassel.h
index 7e78f73..53d9e0b 100644 (file)
--- a/src/common/quassel.h
+++ b/src/common/quassel.h
@@ -84,6 +84,12 @@ public:
 
   static QString translationDirPath();
 
 
   static QString translationDirPath();
 

+  //! Returns a list of directories we look for scripts in
+  /** We look for a subdirectory named "scripts" in the configdir and in all datadir paths.
+  *   \return A list of directory paths containing executable scripts for /exec
+  */
+  static QStringList scriptDirPaths();
+

   static void loadTranslation(const QLocale &locale);
 
   static inline void setCliParser(AbstractCliParser *cliParser);
   static void loadTranslation(const QLocale &locale);
 
   static inline void setCliParser(AbstractCliParser *cliParser);