Prefer R path from PATH (#142)

ManuelHentschel · web-flow · commit 59d76ceb6159 · 2021-05-29T11:39:12.000+02:00
diff --git a/src/utils.ts b/src/utils.ts
@@ -39,10 +39,12 @@ function getRfromEnvPath(platform: string) {
 
 export async function getRpathFromSystem(): Promise<string> {
     
-    let rpath: string = '';
+    let rpath = '';
     const platform: string = process.platform;
     
-    if ( platform === 'win32') {
+    rpath ||= getRfromEnvPath(platform);
+
+    if ( !rpath && platform === 'win32') {
         // Find path from registry
         try {
             const key = new winreg({
@@ -57,8 +59,6 @@ export async function getRpathFromSystem(): Promise<string> {
         }
     }
 
-    rpath ||= getRfromEnvPath(platform);
-
     return rpath;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,12 @@ function getRfromEnvPath(platform: string) {`
`39`	`39`
`40`	`40`	`export async function getRpathFromSystem(): Promise<string> {`
`41`	`41`
`42`		`- let rpath: string = '';`
	`42`	`+ let rpath = '';`
`43`	`43`	`const platform: string = process.platform;`
`44`	`44`
`45`		`- if ( platform === 'win32') {`
	`45`	`+ rpath \|\|= getRfromEnvPath(platform);`
	`46`	`+`
	`47`	`+ if ( !rpath && platform === 'win32') {`
`46`	`48`	`// Find path from registry`
`47`	`49`	`try {`
`48`	`50`	`const key = new winreg({`
`@@ -57,8 +59,6 @@ export async function getRpathFromSystem(): Promise<string> {`
`57`	`59`	`}`
`58`	`60`	`}`
`59`	`61`
`60`		`- rpath \|\|= getRfromEnvPath(platform);`
`61`		`-`
`62`	`62`	`return rpath;`
`63`	`63`	`}`
`64`	`64`