[GRASS-SVN] r40468 - grass/branches/releasebranch_6_4/mswindows

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-01-16 06:36:11 -0500 (Sat, 16 Jan 2010)
New Revision: 40468

Modified:
   grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
Log:
fix newline quoting (merge from devbr6)

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2010-01-16 11:35:40 UTC (rev 40467)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2010-01-16 11:36:11 UTC (rev 40468)
@@ -571,7 +571,7 @@
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem Path to the python directory$\r$\n'
 	FileWrite $0 'set PYTHONHOME=%GRASSDIR%\Python25$\r$\n'
-	FileWrite $0 'if "x%GRASS_PYTHON%" == "x" set GRASS_PYTHON=python\r$\n'
+	FileWrite $0 'if "x%GRASS_PYTHON%" == "x" set GRASS_PYTHON=python$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'set WINGISBASE=%GRASSDIR%$\r$\n'
 	FileWrite $0 '"%WINGISBASE%\etc\Init.bat" %*'
@@ -671,9 +671,10 @@
 	FileWrite $0 'export PYTHONPATH$\r$\n'
 	FileWrite $0 'PYTHONHOME="$INSTALL_DIR\Python25"$\r$\n'
 	FileWrite $0 'export PYTHONHOME$\r$\n'
-	FileWrite $0 'if [ -z "$$GRASS_PYTHON" ] ; then\r$\n'
-	FileWrite $0 '   GRASS_PYTHON=python; export GRASS_PYTHON\r$\n'
-	FileWrite $0 'fi\r$\n'
+	FileWrite $0 'if [ -z "$$GRASS_PYTHON" ] ; then$$\r$\n'
+	FileWrite $0 '   GRASS_PYTHON=python$\r$\n'
+	FileWrite $0 '   export GRASS_PYTHON$\r$\n'
+	FileWrite $0 'fi$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 '# Set the GRASS_PROJSHARE variable$\r$\n'
 	FileWrite $0 'GRASS_PROJSHARE="$INSTALL_DIR\proj"$\r$\n'