[GRASS-SVN] r37070 - grass/trunk/lib/init

[svn_grass at osgeo.org]

Author: glynn
Date: 2009-05-09 11:11:45 -0400 (Sat, 09 May 2009)
New Revision: 37070

Modified:
   grass/trunk/lib/init/functions.sh
   grass/trunk/lib/init/init.sh
Log:
Fix bugs in Init.sh on Windows


Modified: grass/trunk/lib/init/functions.sh
===================================================================
--- grass/trunk/lib/init/functions.sh	2009-05-09 14:51:57 UTC (rev 37069)
+++ grass/trunk/lib/init/functions.sh	2009-05-09 15:11:45 UTC (rev 37070)
@@ -124,20 +124,13 @@
     fi
     export PATH
 
-    # Set LD_LIBRARY_PATH to find GRASS shared libraries
-    if [ ! "GRASS_LD_LIBRARY_PATH" ] ; then
-	GRASS_LD_LIBRARY_PATH="$GISBASE/lib"
+    # Set PYTHONPATH to find GRASS Python modules
+    if [ ! "$PYTHONPATH" ] ; then
+	PYTHONPATH="$GISBASE/etc/python"
     else
-	GRASS_LD_LIBRARY_PATH="$GISBASE/lib:$GRASS_LD_LIBRARY_PATH"
+	PYTHONPATH="$GISBASE/etc/python:$PYTHONPATH"
     fi
-
-# Set PYTHONPATH to find GRASS Python modules
-if [ ! "$PYTHONPATH" ] ; then
-  PYTHONPATH="$GISBASE/etc/python"
-else
-  PYTHONPATH="$GISBASE/etc/python:$PYTHONPATH"
-fi
-export PYTHONPATH
+    export PYTHONPATH
 }
 
 set_defaults()

Modified: grass/trunk/lib/init/init.sh
===================================================================
--- grass/trunk/lib/init/init.sh	2009-05-09 14:51:57 UTC (rev 37069)
+++ grass/trunk/lib/init/init.sh	2009-05-09 15:11:45 UTC (rev 37070)
@@ -144,10 +144,15 @@
 # Get Locale name
 get_locale
 
-# Set PATH, @LD_LIBRARY_PATH_VAR@, PYTHONPATH
-GRASS_LD_LIBRARY_PATH="$@LD_LIBRARY_PATH_VAR@"
+# Set PATH, PYTHONPATH
 set_paths
- at LD_LIBRARY_PATH_VAR@="$GRASS_LD_LIBRARY_PATH"
+
+# Set LD_LIBRARY_PATH (etc) to find GRASS shared libraries
+if [ ! "$@LD_LIBRARY_PATH_VAR@" ] ; then
+    @LD_LIBRARY_PATH_VAR@="$GISBASE/lib"
+else
+    @LD_LIBRARY_PATH_VAR@="$GISBASE/lib:$@LD_LIBRARY_PATH_VAR@"
+fi
 export @LD_LIBRARY_PATH_VAR@
 
 # Set GRASS_PAGER, GRASS_WISH, GRASS_PYTHON, GRASS_GNUPLOT