Explorar o código

fix newline quoting (merge from devbr6)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@40467 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman %!s(int64=15) %!d(string=hai) anos
pai
achega
c7f4229088
Modificáronse 1 ficheiros con 5 adicións e 4 borrados
  1. 5 4
      mswindows/GRASS-Installer.nsi

+ 5 - 4
mswindows/GRASS-Installer.nsi

@@ -571,7 +571,7 @@ Section "GRASS" SecGRASS
 	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 @@ Section "GRASS" SecGRASS
 	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'