[QGIS Commit] r11119 - trunk/qgis/src/plugins/grass

[svn_qgis at osgeo.org]

Author: rugginoso
Date: 2009-07-20 12:08:32 -0400 (Mon, 20 Jul 2009)
New Revision: 11119

Modified:
   trunk/qgis/src/plugins/grass/qgsgrassshell.cpp
Log:
Made the grass binary filename to be built in runtime.


Modified: trunk/qgis/src/plugins/grass/qgsgrassshell.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassshell.cpp	2009-07-20 15:42:30 UTC (rev 11118)
+++ trunk/qgis/src/plugins/grass/qgsgrassshell.cpp	2009-07-20 16:08:32 UTC (rev 11119)
@@ -83,7 +83,9 @@
   QStringList env("");
   QStringList args("");
 
-  terminal->setShellProgram("/usr/bin/grass64");
+  QString shellProgram = QString("/usr/bin/grass%1%2").arg(QgsGrass::versionMajor()).arg(QgsGrass::versionMinor());
+
+  terminal->setShellProgram(shellProgram);
   env << "TERM=vt100";
   env << "GISRC_MODE_MEMORY";