From 899c769862ec6b0b5486dce1f0373193772096b7 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Wed, 27 Aug 2014 15:02:20 -0700
Subject: [PATCH] Dumb bugs are dumb

---
 src/Squirrel/UpdateManager.cs | 12 +++++++-----
 src/Update/Program.cs         |  6 ++++--
 src/Update/Update.csproj      |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Squirrel/UpdateManager.cs b/src/Squirrel/UpdateManager.cs
index e0c23258..1f9487a9 100644
--- a/src/Squirrel/UpdateManager.cs
+++ b/src/Squirrel/UpdateManager.cs
@@ -90,7 +90,8 @@ namespace Squirrel
         const string uninstallRegSubKey = @"Software\Microsoft\Windows\CurrentVersion\Uninstall";
         public async Task<RegistryKey> CreateUninstallerRegistryEntry(string uninstallCmd, string quietSwitch)
         {
-            var releases = ReleaseEntry.ParseReleaseFile(Path.Combine(rootAppDirectory, "packages", "RELEASES"));
+            var releaseContent = File.ReadAllText(Path.Combine(rootAppDirectory, "packages", "RELEASES"), Encoding.UTF8);
+            var releases = ReleaseEntry.ParseReleaseFile(releaseContent);
             var latest = releases.OrderByDescending(x => x.Version).First();
 
             // Download the icon and PNG => ICO it. If this doesn't work, who cares
@@ -99,6 +100,10 @@ namespace Squirrel
                 
             var targetPng = Path.Combine(Path.GetTempPath(), Guid.NewGuid() + ".png");
             var targetIco = Path.Combine(rootAppDirectory, "app.ico");
+
+            var key = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Default)
+                .CreateSubKey(uninstallRegSubKey + "\\" + applicationName, RegistryKeyPermissionCheck.ReadWriteSubTree);
+
             try {
                 var wc = new WebClient();
 
@@ -107,6 +112,7 @@ namespace Squirrel
                 using (var bmp = (Bitmap)Image.FromFile(targetPng))
                 using (var ico = Icon.FromHandle(bmp.GetHicon())) {
                     ico.Save(fs);
+                    key.SetValue("DisplayIcon", targetIco, RegistryValueKind.String);
                 }
             } catch(Exception ex) {
                 this.Log().InfoException("Couldn't write uninstall icon, don't care", ex);
@@ -115,7 +121,6 @@ namespace Squirrel
             }
 
             var stringsToWrite = new[] {
-                new { Key = "DisplayIcon", Value = "targetIco" },
                 new { Key = "DisplayName", Value = zp.Description ?? zp.Summary },
                 new { Key = "DisplayVersion", Value = zp.Version.ToString() },
                 new { Key = "InstallDate", Value = DateTime.Now.ToString("yyyymmdd") },
@@ -132,9 +137,6 @@ namespace Squirrel
                 new { Key = "Language", Value = 0x0409 },
             };
 
-            var key = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Default)
-                .CreateSubKey(uninstallRegSubKey + "\\" + applicationName, RegistryKeyPermissionCheck.ReadWriteSubTree);
-
             foreach (var kvp in stringsToWrite) {
                 key.SetValue(kvp.Key, kvp.Value, RegistryValueKind.String);
             }
diff --git a/src/Update/Program.cs b/src/Update/Program.cs
index 2e536450..03543c5a 100644
--- a/src/Update/Program.cs
+++ b/src/Update/Program.cs
@@ -54,7 +54,7 @@ namespace Squirrel.Update
 
             switch (updateAction) {
             case UpdateAction.Install:
-                Install(silentInstall, target).Wait();
+                Install(silentInstall, Path.GetFullPath(target)).Wait();
                 break;
             case UpdateAction.Uninstall:
                 Uninstall().Wait();
@@ -83,7 +83,9 @@ namespace Squirrel.Update
                 ReleaseEntry.WriteReleaseFile(nupkgs, releasesPath);
             }
 
-            var ourAppName = ReleaseEntry.ParseReleaseFile(releasesPath).First().PackageName;
+            var ourAppName = ReleaseEntry.ParseReleaseFile(File.ReadAllText(releasesPath, Encoding.UTF8))
+                .First().PackageName;
+
             using (var mgr = new UpdateManager(sourceDirectory, ourAppName, FrameworkVersion.Net45)) {
                 await mgr.FullInstall(silentInstall);
                 var updateTarget = Path.Combine(mgr.RootAppDirectory, "Update.exe");
diff --git a/src/Update/Update.csproj b/src/Update/Update.csproj
index 8fbdddda..efa6b2f7 100644
--- a/src/Update/Update.csproj
+++ b/src/Update/Update.csproj
@@ -66,7 +66,7 @@
     <Compile Include="Mono.Options\Options.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SimpleJson.cs" />
+    <Compile Include="SimpleJson\SimpleJson.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />