- Changed the GRASS Shell to determine the grass executable in runtime.

- Cutted off unnecessary includes. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11123 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 20, 2009 · 2f3ed40 · 2f3ed40
1 parent 2758117
commit 2f3ed40
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/plugins/grass/qgsgrassshell.cpp b/src/plugins/grass/qgsgrassshell.cpp
@@ -14,14 +14,10 @@
  ***************************************************************************/
 #include <QTabWidget>
 #include <QVBoxLayout>
-#include <QPushButton>
 #include <QShortcut>
 #include <QKeySequence>
-#include <QSizePolicy>
 
-#include "qgsgrasstools.h"
 #include "qtermwidget/qtermwidget.h"
-#include "qgsapplication.h"
 #include "qgsgrass.h"
 
 #include "qgsgrassshell.h"
@@ -83,7 +79,7 @@ void QgsGrassShell::initTerminal( QTermWidget *terminal )
   QStringList env("");
   QStringList args("");
 
-  QString shellProgram = QString("/usr/bin/grass%1%2").arg(QgsGrass::versionMajor()).arg(QgsGrass::versionMinor());
+  QString shellProgram = QString("%1/etc/Init.sh").arg(::getenv("GISBASE"));
 
   terminal->setShellProgram(shellProgram);
   env << "TERM=vt100";