Skip to content

Commit 98ced14

Browse files
Murali Medisettyzjrunner
authored andcommitted
USERPROFILE should be used to get the user directory
1 parent 74cb5c6 commit 98ced14

File tree

6 files changed

+6
-9
lines changed

6 files changed

+6
-9
lines changed

Tasks/Npm/Tests/test-commandWithoutArguments.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import util = require('./NpmMockHelper');
66
let taskPath = path.join(__dirname, '..', 'npmtask.js');
77
let taskMockRunner = new tmrm.TaskMockRunner(taskPath);
88
let npmMockHelper = new util.NpmMockHelper(taskMockRunner, "root", "");
9-
process.env['HOMEDRIVE'] = 'C:\\';
10-
process.env['HOMEPATH'] = 'Users\\none';
9+
process.env['USERPROFILE'] = 'C:\\Users\\none';
1110

1211
if (process.argv.length == 3) {
1312
if (process.argv[2] === "useDeprecated") {

Tasks/Npm/Tests/test-configlist.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import util = require('./NpmMockHelper');
66
let taskPath = path.join(__dirname, '..', 'npmtask.js');
77
let taskMockRunner = new tmrm.TaskMockRunner(taskPath);
88
let npmMockHelper = new util.NpmMockHelper(taskMockRunner, "config", "list");
9-
process.env['HOMEDRIVE'] = 'C:\\';
10-
process.env['HOMEPATH'] = 'Users\\none';
9+
process.env['USERPROFILE'] = 'C:\\Users\\none';
1110

1211
if (process.argv.length == 3) {
1312
if (process.argv[2] === "useDeprecated") {

Tasks/Npm/Tests/test-npmFailure.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import util = require('./NpmMockHelper');
66
let taskPath = path.join(__dirname, '..', 'npmtask.js');
77
let taskMockRunner = new tmrm.TaskMockRunner(taskPath);
88
let npmMockHelper = new util.NpmMockHelper(taskMockRunner, "root", "");
9-
process.env['HOMEDRIVE'] = 'C:\\';
10-
process.env['HOMEPATH'] = 'Users\\none';
9+
process.env['USERPROFILE'] = 'C:\\Users\\none';
1110

1211
let mock = require('vsts-task-lib/mock-toolrunner');
1312
mock.exec = () => {

Tasks/Npm/npmtask.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ function getUserNpmrcPath() {
108108
var userNpmRc = process.env['npm_config_userconfig'];
109109
if(!userNpmRc){
110110
// default npm rc is located at user's home folder.
111-
userNpmRc = path.join(process.env['HOMEDRIVE'], process.env['HOMEPATH'], '.npmrc');
111+
userNpmRc = path.join(process.env['USERPROFILE'], '.npmrc');
112112
}
113113
tl.debug(`User npm rc: ${userNpmRc}`);
114114
return userNpmRc;

Tasks/Npm/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"version": {
1010
"Major": 0,
1111
"Minor": 2,
12-
"Patch": 18
12+
"Patch": 19
1313
},
1414
"demands": [
1515
"npm"

Tasks/Npm/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"version": {
1010
"Major": 0,
1111
"Minor": 2,
12-
"Patch": 18
12+
"Patch": 19
1313
},
1414
"demands": [
1515
"npm"

0 commit comments

Comments
 (0)