From 6a10cf0c11027bce18f8130391c8751bc53a29c0 Mon Sep 17 00:00:00 2001
From: verhoek <30193551+verhoek@users.noreply.github.com>
Date: Thu, 27 Dec 2018 21:15:40 +0100
Subject: Fixed string format options and fixed stdin commandline parsing for
 gpg2.

---
 BuildTools/AutoUpdateBuilder/Program.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'BuildTools')

diff --git a/BuildTools/AutoUpdateBuilder/Program.cs b/BuildTools/AutoUpdateBuilder/Program.cs
index beef0ee82..6cfdbc9bd 100644
--- a/BuildTools/AutoUpdateBuilder/Program.cs
+++ b/BuildTools/AutoUpdateBuilder/Program.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Security.Cryptography;
 
+using Duplicati.Library.Logging;
+
 namespace AutoUpdateBuilder
 {
     public class Program
@@ -18,6 +20,8 @@ namespace AutoUpdateBuilder
 
         private static string outputfolder;
 
+        private static readonly string LOGTAG = "AutoUpdate";
+
         private static void CompareToManifestPublicKey()
         {
             if (Duplicati.Library.AutoUpdater.AutoUpdateSettings.SignKey == null || privkey.ToXmlString(false) != Duplicati.Library.AutoUpdater.AutoUpdateSettings.SignKey.ToXmlString(false))
@@ -47,12 +51,14 @@ namespace AutoUpdateBuilder
         {
             var srcfile = System.IO.Path.Combine(outputfolder, "package.zip");
 
+            Log.WriteInformationMessage(LOGTAG, "output", "Signing file: ", srcfile);
+
             var armorOption = armor ? "--armor" : "";
             var signatureFileExtension = armor ? "sig.asc" : "sig";
-            var gpgArgument = string.Format("--passphrase-fd 0 --batch --yes --default-key={1} {2} --output \"{0}.{3}\" --detach-sig \"{0}\"",
-                                            srcfile,
-                                            gpgkeyid,
+            var gpgArgument = string.Format("--pinentry-mode loopback --passphrase-fd 0 --batch --yes {0} --default-key \"{1}\" --output \"{2}.{3}\" --detach-sig \"{2}\"",
                                             armorOption,
+                                            gpgkeyid,
+                                            srcfile,
                                             signatureFileExtension);
 
             var proc = System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo
-- 
cgit v1.2.3