[GRASS-SVN] r48552 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-09-29 02:17:06 -0700 (Thu, 29 Sep 2011)
New Revision: 48552

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py
Log:
wxGUI: fix scanning GRASS_ADDON_PATH


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py	2011-09-29 09:08:38 UTC (rev 48551)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py	2011-09-29 09:17:06 UTC (rev 48552)
@@ -156,16 +156,14 @@
     
     if addons and os.getenv('GRASS_ADDON_PATH'):
         path = os.getenv('GRASS_ADDON_PATH')
-        bpath = os.path.join(path, 'bin')
-        spath = os.path.join(path, 'scripts')
-        if os.path.exists(bpath) and os.path.isdir(bpath):
-            for executable in os.listdir(bpath):
+        for ipath in path.split(os.pathsep): 
+            if not os.path.exists(ipath):
+                continue
+            for executable in os.listdir(ipath):
                 ext = os.path.splitext(executable)[1]
                 if not EXT_BIN or \
                         ext in (EXT_BIN, EXT_SCT):
                     cmd.append(executable)
-        if os.path.exists(spath) and os.path.isdir(spath):
-            cmd += os.listdir(spath)
     
     if sys.platform == 'win32':
         for idx in range(len(cmd)):