Commit7bcbea6

authored

Replace uses of process.env.HOME with os.homedir() (microsoft#6479)

1 parentec66642 commit7bcbea6Copy full SHA for 7bcbea6

File tree

-13

lines changed

-13

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1068,10 +1068,7 @@ function onShowRefCommand(arg?: TreeNode): void {`
`1068`	`1068`	`functionreportMacCrashes():void{`
`1069`	`1069`	`if(process.platform==="darwin"){`
`1070`	`1070`	`prevCrashFile="";`
`1071`		`-consthome:string\|undefined=process.env.HOME;`
`1072`		`-if(!home){`
`1073`		`-return;`
`1074`		`-}`
	`1071`	`+consthome:string=os.homedir();`
`1075`	`1072`	`constcrashFolder:string=path.resolve(home,"Library/Logs/DiagnosticReports");`
`1076`	`1073`	`fs.stat(crashFolder,(err,stats)=>{`
`1077`	`1074`	`constcrashObject:{[key:string]:string}={};`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,10 +126,7 @@ export function getVcpkgPathDescriptorFile(): string {`
`126`	`126`	`}`
`127`	`127`	`returnpath.join(pathPrefix,"vcpkg/vcpkg.path.txt");`
`128`	`128`	`}else{`
`129`		`-constpathPrefix:string\|undefined=process.env.HOME;`
`130`		`-if(!pathPrefix){`
`131`		`-thrownewError("Unable to read process.env.HOME");`
`132`		`-}`
	`129`	`+constpathPrefix:string=os.homedir();`
`133`	`130`	`returnpath.join(pathPrefix,".vcpkg/vcpkg.path.txt");`
`134`	`131`	`}`
`135`	`132`	`}`
`@@ -355,10 +352,7 @@ export function resolveVariables(input: string \| undefined, additionalEnvironmen`
`355`	`352`
`356`	`353`	`// Resolve '~' at the start of the path.`
`357`	`354`	`regexp=()=>/^\~/g;`
`358`		`-ret=ret.replace(regexp(),(match:string,name:string)=>{`
`359`		`-constnewValue:string\|undefined=(process.platform==='win32') ?process.env.USERPROFILE :process.env.HOME;`
`360`		`-returnnewValue ?newValue :match;`
`361`		`-});`
	`355`	`+ret=ret.replace(regexp(),(match:string,name:string)=>os.homedir());`
`362`	`356`
`363`	`357`	`returnret;`
`364`	`358`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,13 @@`
`3`	`3`	`* See 'LICENSE' in the project root for license information.`
`4`	`4`	`* ------------------------------------------------------------------------------------------ */`
`5`	`5`	`import*asassertfrom"assert";`
	`6`	`+import*asosfrom"os";`
`6`	`7`	`import{envDelimiter,resolveVariables,escapeForSquiggles}from"../../src/common";`
`7`	`8`
`8`	`9`	`suite("Common Utility validation",()=>{`
`9`	`10`	`suite("resolveVariables",()=>{`
`10`	`11`	`constsuccess:string="success";`
`11`		`-consthome:string=process.env.HOME\|\|process.env.USERPROFILE;`
	`12`	`+consthome:string=os.homedir();`
`12`	`13`
`13`	`14`	`test("raw input",()=>{`
`14`	`15`	`constinput:string="test";`

Comments

(0)