Use ubuntu 18 binary if default linux binary fails

refactorsaurusrex · Dec 25, 2020 · 0cca0e3 · 0cca0e3
1 parent 9d1dbc5
commit 0cca0e3
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 27 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -33,7 +33,7 @@ if ($LASTEXITCODE -ne 0) {
   throw "Failed to publish application."
 }
 
-$targets = 'win-x64','linux-x64','osx-x64'
+$targets = 'win-x64','linux-x64','osx-x64','ubuntu.18.04-x64'
 foreach ($target in $targets) {
   dotnet publish $proj -c Release --self-contained true -r $target --output "$publishOutputDir\$target"
   if ($LASTEXITCODE -ne 0) {

diff --git a/src/JournalCli/Cmdlets/CmdletBase.cs b/src/JournalCli/Cmdlets/CmdletBase.cs
@@ -18,7 +18,8 @@ public abstract class CmdletBase : PSCmdlet
         protected CmdletBase()
         {
             // ReSharper disable AssignNullToNotNullAttribute
-            LogsDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "logs");
+            ModuleDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            LogsDirectory = Path.Combine(ModuleDirectory, "logs");
             var path = Path.Combine(LogsDirectory, ".log");
             // ReSharper restore AssignNullToNotNullAttribute
             Log.Logger = new LoggerConfiguration()
@@ -28,6 +29,8 @@ protected CmdletBase()
 
         protected string LogsDirectory { get; }
 
+        protected string ModuleDirectory { get; }
+
         protected string ResolvePath(string path) => GetUnresolvedProviderPathFromPSPath(path);
 
         protected void ThrowTerminatingError(string message, ErrorCategory category)

diff --git a/src/JournalCli/Cmdlets/JournalCmdletBase.cs b/src/JournalCli/Cmdlets/JournalCmdletBase.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
 using System.Management.Automation;
@@ -17,6 +18,7 @@ public abstract class JournalCmdletBase : CmdletBase
 
 #if !DEBUG
         private static bool _beenWarned;
+        private static bool _binaryMoveAttempted;
         private const string MissingGitBinaryWarning = "You're missing a native binary that's required to enable git integration. " +
             "Click here for more information:\r\n\r\nhttps://journalcli.me/docs/faq#i-got-a-missing-git-binary-warning-whats-that-about\r\n";
 #endif
@@ -87,40 +89,45 @@ private protected Journal OpenJournal()
 
         protected void Commit(GitCommitType commitType)
         {
-#if !DEBUG
-            try
-            {
-                ValidateGitRepo();
-                var message = GitCommitMessage.Get(commitType);
-                CommitCore(message);
-            }
-            catch (TypeInitializationException e) when (e.InnerException is DllNotFoundException)
-            {
-                Log.Error(e, "Error encountered during Commit()");
-                if (!_beenWarned)
-                {
-                    WriteWarning(MissingGitBinaryWarning);
-                    _beenWarned = true;
-                }
-            }
-#endif
+            var message = GitCommitMessage.Get(commitType);
+            Commit(message);
         }
 
         protected void Commit(string message)
         {
 #if !DEBUG
-            try
+            void TryMovingLinuxBinaries()
             {
-                ValidateGitRepo();
-                CommitCore(message);
+                var binaries = Directory.GetFiles(Path.Combine(ModuleDirectory, "ubuntu.18.04-x64"));
+                foreach (var binary in binaries)
+                {
+                    var destination = Path.Combine(ModuleDirectory, "linux-x64", Path.GetFileName(binary));
+                    File.Copy(binary, destination, true);
+                }
             }
-            catch (TypeInitializationException e) when (e.InnerException is DllNotFoundException)
+
+            while (!_beenWarned || !_binaryMoveAttempted)
             {
-                Log.Error(e, "Error encountered during Commit()");
-                if (!_beenWarned)
+                try
+                {
+                    ValidateGitRepo();
+                    CommitCore(message);
+                }
+                catch (TypeInitializationException e) when (e.InnerException is DllNotFoundException)
                 {
-                    WriteWarning(MissingGitBinaryWarning);
-                    _beenWarned = true;
+                    Log.Error(e, $"Error encountered while executing {nameof(Commit)} method");
+
+                    if (_binaryMoveAttempted)
+                    {
+                        if (_beenWarned) continue;
+                        WriteWarning(MissingGitBinaryWarning);
+                        _beenWarned = true;
+                    }
+                    else
+                    {
+                        TryMovingLinuxBinaries();
+                        _binaryMoveAttempted = true;
+                    }
                 }
             }
 #endif