[GRASS-SVN] r42742 - grass/branches/develbranch_6/mswindows

[svn_grass at osgeo.org]

Author: hellik
Date: 2010-07-09 14:42:21 +0000 (Fri, 09 Jul 2010)
New Revision: 42742

Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
Log:
#1092 R's installation path in %PATH%

Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2010-07-09 14:39:49 UTC (rev 42741)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2010-07-09 14:42:21 UTC (rev 42742)
@@ -187,11 +187,17 @@
 	Var /GLOBAL MESSAGE_2_
 	Var /GLOBAL MESSAGE_3_
 	
+	Var /GLOBAL R_HKLM_INSTALL_PATH 
+	Var /GLOBAL R_HKCU_INSTALL_PATH
+	
 	ReadRegStr $UNINSTALL_STRING HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "UninstallString"
 	ReadRegStr $INSTALL_PATH HKLM "Software\${GRASS_BASE}" "InstallPath"
 	ReadRegStr $INSTALLED_VERSION_NUMBER HKLM "Software\${GRASS_BASE}" "VersionNumber"
 	ReadRegStr $INSTALLED_SVN_REVISION HKLM "Software\${GRASS_BASE}" "SvnRevision"
 	
+	ReadRegStr $R_HKLM_INSTALL_PATH HKLM "Software\R-core\R" "InstallPath" 
+	ReadRegStr $R_HKCU_INSTALL_PATH HKCU "Software\R-core\R" "InstallPath"
+	
 	${If} $INSTALLED_SVN_REVISION == ""
 		ReadRegStr $INSTALLED_SVN_REVISION HKLM "Software\${GRASS_BASE}" "Revision"
 	${EndIf}	
@@ -629,6 +635,12 @@
 	FileWrite $0 'set PATH=%GRASSDIR%\msys\bin;%PATH%$\r$\n'
 	FileWrite $0 'set PATH=%GRASSDIR%\extrabin;%GRASSDIR%\extralib;%PATH%$\r$\n'
 	FileWrite $0 'set PATH=%GRASSDIR%\tcl-tk\bin;%GRASSDIR%\sqlite\bin;%GRASSDIR%\gpsbabel;%PATH%$\r$\n'
+	${If} $R_HKLM_INSTALL_PATH != ""
+	FileWrite $0 'set PATH=$R_HKLM_INSTALL_PATH\bin;%PATH%$\r$\n'
+	${EndIf}
+	${If} $R_HKCU_INSTALL_PATH != ""
+	FileWrite $0 'set PATH=$R_HKCU_INSTALL_PATH\bin;%PATH%$\r$\n'
+	${EndIf}
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem Set Path to default web browser$\r$\n'	
 	FileWrite $0 'set GRASS_HTML_BROWSER=explorer$\r$\n'