@@ -36,7 +36,7 @@ const enum Vars {
36
36
NvsHome = 'NVS_HOME' ,
37
37
WindowsNvmHome = 'NVM_HOME' ,
38
38
UnixNvmHome = 'NVM_DIR' ,
39
- UnixFnmHome = 'FNM_DIR' ,
39
+ FnmHome = 'FNM_DIR' ,
40
40
}
41
41
42
42
@injectable ( )
@@ -92,8 +92,8 @@ export class NvmResolver implements INvmResolver {
92
92
if ( ! directory ) {
93
93
const fnmDir =
94
94
this . platform === 'win32'
95
- ? path . join ( this . env [ 'APPDATA' ] || '' , 'fnm' )
96
- : this . env [ Vars . UnixFnmHome ] || path . join ( this . homedir , '.fnm' ) ;
95
+ ? this . env [ Vars . FnmHome ] || path . join ( this . env [ 'APPDATA' ] || '' , 'fnm' )
96
+ : this . env [ Vars . FnmHome ] || path . join ( this . homedir , '.fnm' ) ;
97
97
if ( await this . fsUtils . exists ( fnmDir ) ) {
98
98
directory = await this . resolveFnm ( version , fnmDir ) ;
99
99
versionManagers . push ( 'fnm' ) ;
@@ -164,15 +164,6 @@ export class NvmResolver implements INvmResolver {
164
164
return directory ? path . join ( directory , 'bin' ) : undefined ;
165
165
}
166
166
167
- private async resolveFnm ( version : string , fnmHome : string ) {
168
- const directory = this . findBinFolderForVersion (
169
- path . join ( fnmHome , 'node-versions' ) ,
170
- `v${ version } ` ,
171
- ) ;
172
-
173
- return directory ? path . join ( directory , 'installation' , 'bin' ) : undefined ;
174
- }
175
-
176
167
private async resolveWindowsNvm ( version : string ) {
177
168
const nvmHome = this . env [ Vars . WindowsNvmHome ] ;
178
169
if ( ! nvmHome ) {
@@ -182,6 +173,19 @@ export class NvmResolver implements INvmResolver {
182
173
return this . findBinFolderForVersion ( nvmHome , `v${ version } ` ) ;
183
174
}
184
175
176
+ private async resolveFnm ( version : string , fnmHome : string ) {
177
+ const directory = this . findBinFolderForVersion (
178
+ path . join ( fnmHome , 'node-versions' ) ,
179
+ `v${ version } ` ,
180
+ ) ;
181
+
182
+ if ( ! directory ) return ;
183
+
184
+ return this . platform === 'win32'
185
+ ? path . join ( directory , 'installation' )
186
+ : path . join ( directory , 'installation' , 'bin' ) ;
187
+ }
188
+
185
189
private findBinFolderForVersion (
186
190
dir : string ,
187
191
version : string ,
0 commit comments