[GRASS-SVN] r36288 - grass/branches/releasebranch_6_4/macosx/app

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2009-03-09 12:21:14 -0400 (Mon, 09 Mar 2009)
New Revision: 36288

Modified:
   grass/branches/releasebranch_6_4/macosx/app/grass.sh.in
Log:
PYTHONPATH and GRASS_WXBUNDLED for bundling wxpython (from dev6 r36280, r36283)

Modified: grass/branches/releasebranch_6_4/macosx/app/grass.sh.in
===================================================================
--- grass/branches/releasebranch_6_4/macosx/app/grass.sh.in	2009-03-09 16:07:03 UTC (rev 36287)
+++ grass/branches/releasebranch_6_4/macosx/app/grass.sh.in	2009-03-09 16:21:14 UTC (rev 36288)
@@ -173,6 +173,18 @@
 
 ### end X11 block
 
+# set PYTHONPATH for GUI when bundling wxpython
+GRASS_WXBUNDLED=
+export GRASS_WXBUNDLED
+if [ -d "$GISBASE/etc/wxpython" ] && [ "$GRASS_WXBUNDLED" = "1" ] ; then
+if [ "$PYTHONPATH" ] ; then
+	PYTHONPATH="$GISBASE/etc/wxpython:$PYTHONPATH"
+else
+	PYTHONPATH="$GISBASE/etc/wxpython"
+fi
+export PYTHONPATH
+fi
+
 # if gisrc has text startup, switch back to Terminal (gotta duplicate some init.sh stuff)
 # eventually, when TclTk optional, can run appropriate apps per GUI here (ie X11)
 GISRCRC="$HOME/.grassrc6"