Merge branch 'fixes/octorun-delete-zip-on-mismatch' into fixes/octorun-output-refactoring

StanleyGoldman · StanleyGoldman · commit 0933c3526540 · 2018-04-02T15:34:02.000-04:00
diff --git a/src/GitHub.Api/Installer/OctorunInstaller.cs b/src/GitHub.Api/Installer/OctorunInstaller.cs
@@ -56,10 +56,10 @@ public ITask<NPath> SetupOctorunIfNeeded()
 
         private NPath GrabZipFromResources()
         {
-            if (!installDetails.ZipFile.FileExists())
-            {
-                AssemblyResources.ToFile(ResourceType.Generic, "octorun.zip", installDetails.BaseZipPath, environment);
-            }
+            installDetails.ZipFile.DeleteIfExists();
+            
+            AssemblyResources.ToFile(ResourceType.Generic, "octorun.zip", installDetails.BaseZipPath, environment);
+            
             return installDetails.ZipFile;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,10 @@ public ITask<NPath> SetupOctorunIfNeeded()`
`56`	`56`
`57`	`57`	`private NPath GrabZipFromResources()`
`58`	`58`	`{`
`59`		`- if (!installDetails.ZipFile.FileExists())`
`60`		`- {`
`61`		`- AssemblyResources.ToFile(ResourceType.Generic, "octorun.zip", installDetails.BaseZipPath, environment);`
`62`		`- }`
	`59`	`+ installDetails.ZipFile.DeleteIfExists();`
	`60`	`+`
	`61`	`+ AssemblyResources.ToFile(ResourceType.Generic, "octorun.zip", installDetails.BaseZipPath, environment);`
	`62`	`+`
`63`	`63`	`return installDetails.ZipFile;`
`64`	`64`	`}`
`65`	`65`