Changeset 37070

Timestamp:

May 9, 2009, 8:11:45 AM (15 years ago)

Author:

glynn

Message:

Fix bugs in Init.sh on Windows

Location:

grass/trunk/lib/init

Files:

• functions.sh (modified) (1 diff)
• init.sh (modified) (1 diff)

grass/trunk/lib/init/functions.sh

@@ -125 +125 @@
     export PATH
 
-    # Set LD_LIBRARY_PATH to find GRASS shared libraries
-    if [ ! "GRASS_LD_LIBRARY_PATH" ] ; then
-        GRASS_LD_LIBRARY_PATH="$GISBASE/lib"
-    else
-        GRASS_LD_LIBRARY_PATH="$GISBASE/lib:$GRASS_LD_LIBRARY_PATH"
-    fi
-
-# Set PYTHONPATH to find GRASS Python modules
-if [ ! "$PYTHONPATH" ] ; then
-  PYTHONPATH="$GISBASE/etc/python"
-else
-  PYTHONPATH="$GISBASE/etc/python:$PYTHONPATH"
-fi
-export PYTHONPATH
+    # Set PYTHONPATH to find GRASS Python modules
+    if [ ! "$PYTHONPATH" ] ; then
+        PYTHONPATH="$GISBASE/etc/python"
+    else
+        PYTHONPATH="$GISBASE/etc/python:$PYTHONPATH"
+    fi
+    export PYTHONPATH
 }
 

grass/trunk/lib/init/init.sh

@@ -145 +145 @@
 get_locale
 
-# Set PATH, @LD_LIBRARY_PATH_VAR@, PYTHONPATH
-GRASS_LD_LIBRARY_PATH="$@LD_LIBRARY_PATH_VAR@"
+# Set PATH, PYTHONPATH
 set_paths
-@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@