[GRASS-SVN] r53516 - grass/branches/develbranch_6/gui/wxpython/core

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-10-20 07:11:41 -0700 (Sat, 20 Oct 2012)
New Revision: 53516

Modified:
   grass/branches/develbranch_6/gui/wxpython/core/gcmd.py
   grass/branches/develbranch_6/gui/wxpython/core/globalvar.py
Log:
wxGUI: better check for scripts (#1692)

Modified: grass/branches/develbranch_6/gui/wxpython/core/gcmd.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/core/gcmd.py	2012-10-20 13:35:05 UTC (rev 53515)
+++ grass/branches/develbranch_6/gui/wxpython/core/gcmd.py	2012-10-20 14:11:41 UTC (rev 53516)
@@ -530,8 +530,8 @@
             # Python GUI script should be replaced by Shell scripts
             os.chdir(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'scripts'))
             args = [sys.executable, self.cmd[0]] + self.cmd[1:]
-        if sys.platform == 'win32' and os.getenv('GRASS_ADDON_PATH') and \
-                os.path.exists(os.path.join(os.getenv('GRASS_ADDON_PATH'), self.cmd[0] + globalvar.SCT_EXT)):
+        if sys.platform == 'win32' and \
+                self.cmd[0] in globalvar.grassScripts[globalvar.SCT_EXT]:
             args[0] = self.cmd[0] + globalvar.SCT_EXT
             env = copy.deepcopy(self.env)
             env['PATH'] = os.path.join(os.getenv('GISBASE').replace('/', '\\'), 'scripts') + \

Modified: grass/branches/develbranch_6/gui/wxpython/core/globalvar.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/core/globalvar.py	2012-10-20 13:35:05 UTC (rev 53515)
+++ grass/branches/develbranch_6/gui/wxpython/core/globalvar.py	2012-10-20 14:11:41 UTC (rev 53516)
@@ -3,7 +3,7 @@
 
 @brief Global variables used by wxGUI
 
-(C) 2007-2011 by the GRASS Development Team
+(C) 2007-2012 by the GRASS Development Team
 
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.