Fix fallback urls (#6)

Danny McCormick · web-flow · commit 32271541aee2 · 2019-07-23T11:03:29.000-04:00
diff --git a/lib/installer.js b/lib/installer.js
@@ -250,8 +250,8 @@ class DotnetCoreInstaller {
                         }
                     }
                 });
-                primaryUrlSearchString = 'dotnet-install: Primary - ';
-                legacyUrlSearchString = 'dotnet-install: Legacy - ';
+                primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
+                legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
             }
             else {
                 let escapedScript = path
@@ -266,8 +266,8 @@ class DotnetCoreInstaller {
                         }
                     }
                 });
-                primaryUrlSearchString = 'dotnet-install: Payload URL: ';
-                legacyUrlSearchString = 'dotnet-install: Legacy payload URL: ';
+                primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
+                legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
             }
             if (resultCode != 0) {
                 throw `Failed to get download urls with result code ${resultCode}. ${output}`;
diff --git a/src/installer.ts b/src/installer.ts
@@ -274,8 +274,8 @@ export class DotnetCoreInstaller {
         }
       );
 
-      primaryUrlSearchString = 'dotnet-install: Primary - ';
-      legacyUrlSearchString = 'dotnet-install: Legacy - ';
+      primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
+      legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
     } else {
       let escapedScript = path
         .join(__dirname, '..', 'externals', 'install-dotnet.sh')
@@ -295,8 +295,8 @@ export class DotnetCoreInstaller {
         }
       );
 
-      primaryUrlSearchString = 'dotnet-install: Payload URL: ';
-      legacyUrlSearchString = 'dotnet-install: Legacy payload URL: ';
+      primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
+      legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
     }
 
     if (resultCode != 0) {

Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,8 @@ class DotnetCoreInstaller {`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`	`});`
`253`		`- primaryUrlSearchString = 'dotnet-install: Primary - ';`
`254`		`- legacyUrlSearchString = 'dotnet-install: Legacy - ';`
	`253`	`+ primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';`
	`254`	`+ legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';`
`255`	`255`	`}`
`256`	`256`	`else {`
`257`	`257`	`let escapedScript = path`
`@@ -266,8 +266,8 @@ class DotnetCoreInstaller {`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`	`});`
`269`		`- primaryUrlSearchString = 'dotnet-install: Payload URL: ';`
`270`		`- legacyUrlSearchString = 'dotnet-install: Legacy payload URL: ';`
	`269`	`+ primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';`
	`270`	`+ legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';`
`271`	`271`	`}`
`272`	`272`	`if (resultCode != 0) {`
`273`	`273`	throw `Failed to get download urls with result code ${resultCode}. ${output}`;
Original file line number	Diff line number	Diff line change
`@@ -274,8 +274,8 @@ export class DotnetCoreInstaller {`
`274`	`274`	`}`
`275`	`275`	`);`
`276`	`276`
`277`		`- primaryUrlSearchString = 'dotnet-install: Primary - ';`
`278`		`- legacyUrlSearchString = 'dotnet-install: Legacy - ';`
	`277`	`+ primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';`
	`278`	`+ legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';`
`279`	`279`	`} else {`
`280`	`280`	`let escapedScript = path`
`281`	`281`	`.join(__dirname, '..', 'externals', 'install-dotnet.sh')`
`@@ -295,8 +295,8 @@ export class DotnetCoreInstaller {`
`295`	`295`	`}`
`296`	`296`	`);`
`297`	`297`
`298`		`- primaryUrlSearchString = 'dotnet-install: Payload URL: ';`
`299`		`- legacyUrlSearchString = 'dotnet-install: Legacy payload URL: ';`
	`298`	`+ primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';`
	`299`	`+ legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`if (resultCode != 0) {`