actions
/
setup-dotnet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fallback urls (#6)

This commit is contained in:
Danny McCormick 2019-07-23 11:03:29 -04:00 committed by GitHub
parent 035f3d68f7
commit 32271541ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/installer.js
View File

@ -250,8 +250,8 @@ class DotnetCoreInstaller {
} }
} }
}); });
primaryUrlSearchString = 'dotnet-install: Primary - '; primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
legacyUrlSearchString = 'dotnet-install: Legacy - '; legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
} }
else { else {
let escapedScript = path let escapedScript = path
@ -266,8 +266,8 @@ class DotnetCoreInstaller {
} }
} }
}); });
primaryUrlSearchString = 'dotnet-install: Payload URL: '; primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
legacyUrlSearchString = 'dotnet-install: Legacy payload URL: '; legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
} }
if (resultCode != 0) { if (resultCode != 0) {
throw `Failed to get download urls with result code ${resultCode}. ${output}`; throw `Failed to get download urls with result code ${resultCode}. ${output}`;

8
src/installer.ts
View File

@ -274,8 +274,8 @@ export class DotnetCoreInstaller {
} }
); );
primaryUrlSearchString = 'dotnet-install: Primary - '; primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
legacyUrlSearchString = 'dotnet-install: Legacy - '; legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
} else { } else {
let escapedScript = path let escapedScript = path
.join(__dirname, '..', 'externals', 'install-dotnet.sh') .join(__dirname, '..', 'externals', 'install-dotnet.sh')
@ -295,8 +295,8 @@ export class DotnetCoreInstaller {
} }
); );
primaryUrlSearchString = 'dotnet-install: Payload URL: '; primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
legacyUrlSearchString = 'dotnet-install: Legacy payload URL: '; legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
} }
if (resultCode != 0) { if (resultCode != 0) {