diff --git a/python/plugins/processing/algs/r/RUtils.py b/python/plugins/processing/algs/r/RUtils.py index c73115d717c..fe2d542f34e 100644 --- a/python/plugins/processing/algs/r/RUtils.py +++ b/python/plugins/processing/algs/r/RUtils.py @@ -41,6 +41,7 @@ class RUtils: RSCRIPTS_FOLDER = 'R_SCRIPTS_FOLDER' R_FOLDER = 'R_FOLDER' R_USE64 = 'R_USE64' + R_LIBS_USER = 'R_LIBS_USER' @staticmethod def RFolder(): @@ -50,6 +51,15 @@ class RUtils: return os.path.abspath(unicode(folder)) + @staticmethod + def RLibs(): + folder = ProcessingConfig.getSetting(RUtils.R_LIBS_USER) + if folder is None: + folder = unicode(os.path.join(userFolder(), 'rlibs')) + mkdir(folder) + + return os.path.abspath(unicode(folder)) + @staticmethod def RScriptsFolder(): folder = ProcessingConfig.getSetting(RUtils.RSCRIPTS_FOLDER) @@ -90,8 +100,9 @@ class RUtils: 'BATCH', '--vanilla', RUtils.getRScriptFilename(), - RUtils.getConsoleOutputFilename(), + RUtils.getConsoleOutputFilename() ] + else: os.chmod(RUtils.getRScriptFilename(), stat.S_IEXEC | stat.S_IREAD | stat.S_IWRITE)