изменения для первого тестового самообновления

Author: szagidullina

Commands/SelfUpdate.cs

@@ -45,7 +45,7 @@ public static void UpdateIfOld()
             }
             catch (Exception exception)
             {
-                Log.LogError("Auto update failed, error: '{Exception}'", exception);
+                Log.LogError(exception, "Auto update failed, error: '{ErrorMessage}'", exception.Message);
                 ConsoleWriter.WriteWarning("Auto update failed. Check logs for details");
             }
         }
@@ -81,13 +81,14 @@ protected override int Execute()
             }
             catch (Exception exception)
             {
-                Log.LogError("Fail to install cement", exception);
+                Log.LogError(exception, "Fail to install cement: '{ErrorMessage}'", exception.Message);
                 ConsoleWriter.WriteError("Fail to install cement: " + exception);
             }
 
             var server = CementSettings.Get().CementServer;
             Log.LogInformation($"Cement server: {server}");
-            var updater = server == null
+            
+            var updater = server == null 
                 ? (ICementUpdater) new CementFromGitHubUpdater(Log)
                 : (ICementUpdater) new CementFromServerUpdater(server, branch, Log);
 
@@ -99,23 +100,39 @@ private static void CreateRunners()
             const string cmdText = @"@echo off
 ""%~dp0\dotnet\cm.exe"" %*
 SET exit_code=%errorlevel%
-if exist %~dp0\dotnet\cm_new.exe (
-	copy %~dp0\dotnet\cm_new.exe %~dp0\dotnet\cm.exe /Y > nul
-	del %~dp0\dotnet\cm_new.exe > nul
-)
+if exist %~dp0\dotnet\win10-x64\cm.exe (
+	copy %~dp0\dotnet\win10-x64\cm.exe %~dp0\dotnet\cm.exe /Y > nul
+    del %~dp0\dotnet\win10-x64\cm.exe > nul
+) else (
+    if exist %~dp0\dotnet\cm_new.exe (
+	    copy %~dp0\dotnet\cm_new.exe %~dp0\dotnet\cm.exe /Y > nul
+	    del %~dp0\dotnet\cm_new.exe > nul
+        )
+    )
 cmd /C exit %exit_code% > nul";
 
             var bashTextUnix = @"#!/bin/bash
 path=""`dirname \""$0\""`/dotnet/cm.exe""
-cmd=""mono $path""
+usingMono=""mono ""
+if [ -f ~/bin/dotnet/linux-x64/cm ]
+then
+    usingMono=""""
+fi
+cmd=""$usingMono$path""
 for word in ""$@""; do cmd=""$cmd \""$word\""""; done
 eval $cmd
 exit_code=$?
-if [ -f ~/bin/dotnet/cm_new.exe ];
+if [ -f ~/bin/dotnet/linux-x64/cm ];
 then
-	cp ~/bin/dotnet/cm_new.exe ~/bin/dotnet/cm.exe
-	rm ~/bin/dotnet/cm_new.exe
+	cp ~/bin/dotnet/linux-x64/cm ~/bin/dotnet/cm.exe
+    rm ~/bin/dotnet/linux-x64/cm
 	chmod u+x ~/bin/dotnet/cm.exe
+else
+    if [ -f ~/bin/dotnet/cm_new.exe ]
+    then
+        cp ~/bin/dotnet/cm_new.exe ~/bin/dotnet/cm.exe
+	    rm ~/bin/dotnet/cm_new.exe
+    fi
 fi
 exit $exit_code";
             bashTextUnix = bashTextUnix.Replace("\r\n", "\n");
@@ -125,11 +142,17 @@ chmod u+x ~/bin/dotnet/cm.exe
 args=$@
 $path ""$@""
 exit_code=$?
-if [ -f ~/bin/dotnet/cm_new.exe ];
+if [ -f ~/bin/dotnet/os-x64/cm ];
 then
-	cp ~/bin/dotnet/cm_new.exe ~/bin/dotnet/cm.exe
-	rm ~/bin/dotnet/cm_new.exe
+	cp ~/bin/dotnet/os-x64/cm ~/bin/dotnet/cm.exe
+    rm ~/bin/dotnet/os-x64/cm
 	chmod u+x ~/bin/dotnet/cm.exe
+else
+    if [ -f ~/bin/dotnet/cm_new.exe ]
+    then
+        cp ~/bin/dotnet/cm_new.exe ~/bin/dotnet/cm.exe
+	    rm ~/bin/dotnet/cm_new.exe
+    fi
 fi
 exit $exit_code";
 
@@ -196,7 +219,7 @@ private bool UpdateBinaries(ICementUpdater updater, string oldHash, string newHa
             }
             catch (WebException webException)
             {
-                Log.LogError("Fail self-update, exception: '{Exception}'", webException);
+                Log.LogError(webException, "Fail self-update, exception: '{ErrorMessage}'", webException.Message);
 
                 if (webException.Status == WebExceptionStatus.ProtocolError && webException.Response != null)
                 {
@@ -239,9 +262,7 @@ private void CopyNewCmExe(string from)
             Log.LogDebug("dotnet install folder: " + dotnetInstallFolder);
 
             var cm = Path.Combine(from, "cm.exe");
-            var cmNew = Path.Combine(from, "cm_new.exe");
-            File.Copy(cm, cmNew, true);
-            if (!IsInstallingCement && File.Exists(Path.Combine(dotnetInstallFolder, "cm.exe")))
+            if (!IsInstallingCement && File.Exists(Path.Combine(dotnetInstallFolder, "cm.exe"))) 
                 File.Delete(cm);
 
             var files = Directory.GetFiles(from, "*", SearchOption.AllDirectories);

Common/CementFromLocalPathUpdater.cs

@@ -0,0 +1,46 @@
+using System;
+using System.IO;
+using Microsoft.Extensions.Logging;
+
+namespace Common
+{
+    public sealed class CementFromLocalPathUpdater : ICementUpdater
+    {
+        private readonly ILogger log;
+
+        public CementFromLocalPathUpdater(ILogger log)
+        {
+            this.log = log;
+        }
+
+        public string GetNewCommitHash()
+        {
+            return DateTime.Now.Ticks.ToString();
+        }
+
+        public byte[] GetNewCementZip()
+        {
+            try
+            { 
+                return File.ReadAllBytes(Path.Combine(GetZipCementDirectory(), "cement.zip"));
+            }
+            catch (Exception ex)
+            {
+                log.LogError(ex,"Fail self-update, exception: '{ErrorMessage}' ", ex.Message);
+            }
+
+            return null;
+        }
+
+        private string GetZipCementDirectory()
+        {
+            var zipDir = Path.Combine(Helper.HomeDirectory(), "work");
+            if (!Directory.Exists(zipDir))
+                Directory.CreateDirectory(zipDir);
+            return zipDir;
+        }
+        
+        public string GetName() =>
+            "fileSystemLocalPath";
+    }
+}