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

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-07-13 09:55:54 -0700 (Sat, 13 Jul 2013)
New Revision: 57089

Modified:
   grass/trunk/lib/init/grass.py
Log:
fix r57087


Modified: grass/trunk/lib/init/grass.py
===================================================================
--- grass/trunk/lib/init/grass.py	2013-07-13 16:47:45 UTC (rev 57088)
+++ grass/trunk/lib/init/grass.py	2013-07-13 16:55:54 UTC (rev 57089)
@@ -726,15 +726,15 @@
         os.environ[k] = v
     # Allow for mixed ISIS-GRASS Environment
     if os.getenv('ISISROOT'):
-		isis = os.getenv('ISISROOT')
-        os.environ['ISIS_LIB'] = isis + "/lib"
-        os.environ['ISIS_3RDPARTY'] = isis + "/3rdParty/lib"
-        os.environ['QT_PLUGIN_PATH'] = isis + "/3rdParty/plugins"
+        isis = os.getenv('ISISROOT')
+        os.environ['ISIS_LIB'] = isis + os.sep + "lib"
+        os.environ['ISIS_3RDPARTY'] = isis + os.sep + "3rdParty" + os.sep + "lib"
+        os.environ['QT_PLUGIN_PATH'] = isis + os.sep + "3rdParty" + os.sep + "plugins"
         #os.environ['ISIS3DATA'] = isis + "$ISIS3DATA"
-        libpath = os.getenv('LD_LIBRARY_PATH')
+        libpath = os.getenv('LD_LIBRARY_PATH', '')
         isislibpath = os.getenv('ISIS_LIB')
         isis3rdparty = os.getenv('ISIS_3RDPARTY')
-        os.environ['LD_LIBRARY_PATH'] = libpath + ":" + isislibpath + ":" + isis3rdparty
+        os.environ['LD_LIBRARY_PATH'] = libpath + os.pathsep + isislibpath + os.pathsep + isis3rdparty
 
 
 def set_language():
@@ -1033,10 +1033,11 @@
 
     f = open(bashrc, 'w')
     f.write("test -r ~/.alias && . ~/.alias\n")
-	if os.getenv('ISISROOT'):
+    if os.getenv('ISISROOT'):
         f.write("PS1='ISIS-GRASS %s (%s):\w > '\n" % (grass_version, location_name))
-	else:
+    else:
         f.write("PS1='GRASS %s (%s):\w > '\n" % (grass_version, location_name))
+    
     f.write("PROMPT_COMMAND=\"'%s'\"\n" % os.path.join(gisbase, 'etc',
                                                        'prompt.py'))