[GRASS-SVN] r69912 - in grass/branches/releasebranch_7_0/mswindows: . osgeo4w

[svn_grass at osgeo.org]

Author: hellik
Date: 2016-11-25 03:21:39 -0800 (Fri, 25 Nov 2016)
New Revision: 69912

Modified:
   grass/branches/releasebranch_7_0/mswindows/env.bat
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl
Log:
set R_USER if %USERPROFILE%\Documents\R\ exists to catch most common cases of private R libraries in windows - step 1 to prepare OSGeo4w-winGRASS for the same R-GRASS-coupling as standalone winGRASS (r69883,r69910 from trunk)

Modified: grass/branches/releasebranch_7_0/mswindows/env.bat
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/env.bat	2016-11-25 11:14:56 UTC (rev 69911)
+++ grass/branches/releasebranch_7_0/mswindows/env.bat	2016-11-25 11:21:39 UTC (rev 69912)
@@ -19,6 +19,9 @@
 
 IF EXIST "%ProgramFiles%\RStudio\bin\rstudio.exe" set PATH=%PATH%;%ProgramFiles%\RStudio\bin
 
+REM set R_USER if %USERPROFILE%\Documents\R\ exists to catch most common cases of private R libraries
+IF EXIST "%USERPROFILE%\Documents\R\" set R_USER=%USERPROFILE%\Documents\
+
 REM set R temporarily to %PATH%
 
 IF EXIST "%ProgramFiles%\R\" ("%GISBASE%\extrabin\R" path)

Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl	2016-11-25 11:14:56 UTC (rev 69911)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl	2016-11-25 11:21:39 UTC (rev 69912)
@@ -22,3 +22,6 @@
 REM set RStudio temporarily to %PATH% if it exists
 
 IF EXIST "%ProgramFiles%\RStudio\bin\rstudio.exe" set PATH=%PATH%;%ProgramFiles%\RStudio\bin
+
+REM set R_USER if %USERPROFILE%\Documents\R\ exists to catch most common cases of private R libraries
+IF EXIST "%USERPROFILE%\Documents\R\" set R_USER=%USERPROFILE%\Documents\
\ No newline at end of file