sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2026-01-04 21:30:05 +00:00
Code Issues Projects Releases Wiki Activity

chore: replace env variable RSCRIPT_PATH with R_PATH

Browse Source
This commit is contained in:
Sabir Hassan
2022-09-09 15:23:46 +05:00
parent 16b7aa6abb
commit 662b2ca36a
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/src/utils/getDesktopFields.ts
View File

@@ -4,9 +4,9 @@ import { createFolder, fileExists, folderExists, isWindows } from '@sasjs/utils'
import { RunTimeType } from './verifyEnvVariables'
export const getDesktopFields = async () => {
const { SAS_PATH, NODE_PATH, PYTHON_PATH, RSCRIPT_PATH } = process.env
const { SAS_PATH, NODE_PATH, PYTHON_PATH, R_PATH } = process.env
let sasLoc, nodeLoc, pythonLoc, rscriptLoc
let sasLoc, nodeLoc, pythonLoc, rLoc
if (process.runTimes.includes(RunTimeType.SAS)) {
sasLoc = SAS_PATH ?? (await getSASLocation())
@@ -21,10 +21,10 @@ export const getDesktopFields = async () => {
}
if (process.runTimes.includes(RunTimeType.R)) {
rscriptLoc = RSCRIPT_PATH ?? (await getRScriptLocation())
rLoc = R_PATH ?? (await getRLocation())
}
return { sasLoc, nodeLoc, pythonLoc, rscriptLoc }
return { sasLoc, nodeLoc, pythonLoc, rLoc }
}
const getDriveLocation = async (): Promise<string> => {
@@ -122,9 +122,9 @@ const getPythonLocation = async (): Promise<string> => {
return targetName
}
const getRScriptLocation = async (): Promise<string> => {
const getRLocation = async (): Promise<string> => {
const validator = async (filePath: string) => {
if (!filePath) return 'Path to RScript executable is required.'
if (!filePath) return 'Path to R executable is required.'
if (!(await fileExists(filePath))) {
return 'No file found at provided path.'
@@ -136,7 +136,7 @@ const getRScriptLocation = async (): Promise<string> => {
const defaultLocation = isWindows() ? 'C:\\Rscript' : '/usr/bin/Rscript'
const targetName = await getString(
'Please enter full path to a Rscript executable: ',
'Please enter full path to a R executable: ',
validator,
defaultLocation
)