Skip to content

Commit

Permalink
Merge pull request dotnet#5322 from JoeRobich/fix-alpine-support
Browse files Browse the repository at this point in the history
Fix alpine support
  • Loading branch information
JoeRobich authored Jul 29, 2022
2 parents 5b25ff5 + cdaa1a7 commit a675b5f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
"x86_64"
],
"installTestPath": "./.omnisharp/1.39.1-net6.0/OmniSharp.dll",
"platformId": "alpine-x64",
"platformId": "linux-musl-x64",
"isFramework": false,
"integrity": "13A18F07ED10B96A77EF97A51FCF2ECA740A427A1C2867C41846CE0B00AD1004"
},
Expand All @@ -395,7 +395,7 @@
"arm64"
],
"installTestPath": "./.omnisharp/1.39.1-net6.0/OmniSharp.dll",
"platformId": "alpine-arm64",
"platformId": "linux-musl-arm64",
"isFramework": false,
"integrity": "C5155A59D194536684B19D65E996AB645C02BD8EB66C9C810589C55E9C263E75"
},
Expand Down
11 changes: 5 additions & 6 deletions src/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ export function getExtensionPath() {
return extensionPath;
}

export function getUnixTempDirectory(){
export function getUnixTempDirectory() {
let envTmp = process.env.TMPDIR;
if(!envTmp)
{
if (!envTmp) {
return "/tmp/";
}

Expand Down Expand Up @@ -61,9 +60,9 @@ export async function execChildProcess(command: string, workingDirectory: string
return new Promise<string>((resolve, reject) => {
cp.exec(command, { cwd: workingDirectory, maxBuffer: 500 * 1024 }, (error, stdout, stderr) => {
if (error) {
reject(`${error}
reject(new Error(`${error}
${stdout}
${stderr}`);
${stderr}`));
}
else if (stderr && !stderr.includes("screen size is bogus")) {
reject(new Error(stderr));
Expand Down Expand Up @@ -203,7 +202,7 @@ export function isSubfolderOf(subfolder: string, folder: string): boolean {
/**
* Find PowerShell executable from PATH (for Windows only).
*/
export function findPowerShell(): string | undefined {
export function findPowerShell(): string | undefined {
const dirs: string[] = (process.env.PATH || '').replace(/"+/g, '').split(';').filter(x => x);
const names: string[] = ['pwsh.exe', 'powershell.exe'];
for (const name of names) {
Expand Down

0 comments on commit a675b5f

Please sign in to comment.