[GRASS-SVN] r56428 - in grass/trunk/mswindows: . osgeo4w

svn_grass at osgeo.org svn_grass at osgeo.org
Mon May 27 01:24:26 PDT 2013


Author: neteler
Date: 2013-05-27 01:24:25 -0700 (Mon, 27 May 2013)
New Revision: 56428

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
   grass/trunk/mswindows/osgeo4w/grass.tmpl
Log:
winGRASS installer: protect white spaces in GRASS_PYTHON

Modified: grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2013-05-26 20:03:54 UTC (rev 56427)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2013-05-27 08:24:25 UTC (rev 56428)
@@ -847,7 +847,7 @@
 	FileWrite $0 'GEOTIFF_CSV="$INSTALL_DIR\share\epsg_csv"$\r$\n'
 	FileWrite $0 'export GEOTIFF_CSV$\r$\n'
 	FileWrite $0 '$\r$\n'
-	FileWrite $0 '"$$GRASS_PYTHON $$GISBASE/etc/grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at .py" "$$@"'
+	FileWrite $0 '"$$GRASS_PYTHON" "$$GISBASE/etc/grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at .py" "$$@"'
 	FileClose $0
 	done_create_grass_command:
 		

Modified: grass/trunk/mswindows/osgeo4w/grass.tmpl
===================================================================
--- grass/trunk/mswindows/osgeo4w/grass.tmpl	2013-05-26 20:03:54 UTC (rev 56427)
+++ grass/trunk/mswindows/osgeo4w/grass.tmpl	2013-05-27 08:24:25 UTC (rev 56428)
@@ -11,6 +11,6 @@
 export $OSGEO4W_ROOT_MSYS $GISBASE $GRASS_SH $GRASS_PYTHON $PYTHONHOME $GRASS_PROJSHARE
 export $PATH
 
-$GRASS_PYTHON "$GISBASE/etc/grass at POSTFIX@.py" "$@"
+"$GRASS_PYTHON" "$GISBASE/etc/grass at POSTFIX@.py" "$@"
 
 exit 0



More information about the grass-commit mailing list