From c0159ac183cf0b83c4f080d6105926926bf34450 Mon Sep 17 00:00:00 2001
From: Roger Zander <roger@zander.ch>
Date: Wed, 14 Feb 2018 19:33:35 +0100
Subject: [PATCH] Fix: cleanup

---
 RuckZuck_Tool/Images/RuckZuck.png             | Bin 0 -> 1292 bytes
 RuckZuck_Tool/Properties/Resources.resx       |  26 ++++++++----------
 RuckZuck_Tool/Properties/Settings.Designer.cs |  22 +++++++++++----
 RuckZuck_Tool/Properties/Settings.settings    |   7 +++--
 4 files changed, 34 insertions(+), 21 deletions(-)
 create mode 100644 RuckZuck_Tool/Images/RuckZuck.png

diff --git a/RuckZuck_Tool/Images/RuckZuck.png b/RuckZuck_Tool/Images/RuckZuck.png
new file mode 100644
index 0000000000000000000000000000000000000000..d61469df63409838026d22ac549c411810f619c8
GIT binary patch
literal 1292
zcmV+n1@roeP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkSzDYzuRA}DqSv!awRT%!xIrF^UtedrvL?y9`iJ*d=WUGK6Vh}_m
z5G%2<v4~}g6sAy%6taaZiD<%xXyGF^!E_;|#0M6F2D8M3#O&VpoX4Dp#q6EEkJ;V3
zxi@A9_J_-VUc>pm|25~#1-4~dwq?u8<<@6zqcwD^lep44?@H~3vr8YipOZ_jv>pgZ
z6~FNx%Ns(w{e95R;llC>S4sl2JB|>K5G1x$P7id&T8q!`9do55K-5f5qO=|msRjVd
z-#qS0NuW!D2Ay(xfTs$P?_sH>aJBxOE2RgPS_+hD+_cy7F|XU0zj@rntb){Ef)+8n
zh(n8bb>Tq2SJs*v9Dn!856OL5-z1r}S(XPkYX1(0P?K{2$Tu7Wv=;dF<|YBYu=cMI
z=_BC9JZCy-83+8;<sTdXXp@C~R}T^3Qs-VMlEJyP)((!3YxzIgzn~^-@EC#68XhBk
zBys}U8F(=t0?}<x#r<K@?GFMD$YjIDP!5X}LTf~x2ch-aWwa$EYO<DtXmXCJIL<*9
z>B0FZ%Jd|_pSy9&H93cNCVLO8fbaGT%cyb!%5gL~M?m5Yby4W_j*k=joGpQq`e-*Y
zsWqga=m?cRq#WN+cY*hMZKwYj&fPfW#*O_Z=a5>XBUJvAf<g*f-~k-~o&tbA68-Tg
z*4(g5s>-s1S4^j|usC;LB+e|JbREUPNgZ1EAK)|uG(<rXLqIA64^d{xL=KT)HYz03
z+ol0WYAmG7O7dn%e1GelTUeZPhH^A@10A7?FFDbk;Wse=FiLWEj1n{x2^rkO4!;U!
zqduVBKC@9yOc(`lASNM{7I=hJKuLgw#W`2?9>w9^M++1C@||zoU3m+sNwK7EgOeH>
zs*&RW0An2(B{0@uPvx0m0>%~_N-6`X8VISvbU2lRHdMf*J`4;j3?de+zWQAqfz5Iv
zfJNv<xrN)hfsj=4wLbHam=3H{_*-5_M=G@KD)=t0-gd7cyiwgNEyo?s5z-hwD5$N1
z1X-9kRe=bSTvIS8v=I?NF%GUmv~(RIiLk?)0fP^N6acU+@1SLBXe22*^lqOai`pUW
zuW;UG6HHnT3678o_&Nf$6<C@88o-J+$m(>82B@qcjyYfeMPjr}4SJ=FTgss|McdRN
z!GVDbmrM;ppY@HsH1jfm`C$TFDa1iAvaX8;;($Y@_b?S!L7Wedu;IHbP0*15wH0(|
zBOgy8AhiM4?REE&X~vdP3vC=;+5Ki;9_5|)e>yU;FJK|d+#GtVgyf3ZrQw^u&^rT4
z7!K`vb*K<{y^AJxd(!O{J-HKY$l}5(R+<~x$1j{A>mDTrPkCEK5<zh2@xyD*uZEEJ
zk!(Q@2X^kq>rWjerTjMf^weG)d-enw=`=bhrw?8rrw?8r4+FSz2@dSskK@mMwBi2w
zg14`{mY319vlsgw?4A2R<c+;=ts6G$dSDQIcdW{$A2{$To5tDMi)2*rLmnss-z#5T
z|I%Ij=j#UoextoNB(SNw>Yu0GrQ6>^r0H0or~Mhs&n}FWXJaSnr@w#VeqFwXdb&K)
z`d#r8cz)(ZytD7Uhf*L$mh*poQSN^iw`E&OBL4wGLB9pNvmwR+0000<MNUMnLSTY;
Cc~VRO

literal 0
HcmV?d00001

diff --git a/RuckZuck_Tool/Properties/Resources.resx b/RuckZuck_Tool/Properties/Resources.resx
index 9c5b816..1cac1c1 100644
--- a/RuckZuck_Tool/Properties/Resources.resx
+++ b/RuckZuck_Tool/Properties/Resources.resx
@@ -1347,7 +1347,7 @@ namespace RZUpdate
                         }
 
                         //Only Check Hash if downloaded
-                        if (!string.IsNullOrEmpty(vFile.FileHash) &amp; bDownload)
+                        if (!string.IsNullOrEmpty(vFile.FileHash) &amp;&amp; bDownload)
                         {
                             if (string.IsNullOrEmpty(vFile.HashType))
                                 vFile.HashType = "MD5";
@@ -1689,7 +1689,7 @@ namespace RZUpdate
                 else
                 {
                     Console.WriteLine("WARNING: Product not detected after installation.");
-                    if (iExitCode != 0 &amp; iExitCode != 3010)
+                    if (iExitCode != 0 &amp;&amp; iExitCode != 3010)
                     {
                         if (SendFeedback)
                             RZRestAPI.Feedback(SW.ProductName, SW.ProductVersion, SW.Manufacturer, SW.Architecture, "false", sUserName, "Product not detected after installation.").ConfigureAwait(false); ;
@@ -1767,7 +1767,7 @@ namespace RZUpdate
                     RZisRunning = false;
                 }
             }
-            while (msiIsRunning | RZisRunning);
+            while (msiIsRunning || RZisRunning);
 
             bool bMutexCreated = false;
             bool bResult = false;
@@ -1803,7 +1803,7 @@ namespace RZUpdate
             {
                 bool bError = false;
 
-                if (!CheckDTPreReq() &amp; !Force)
+                if (!CheckDTPreReq() &amp;&amp; !Force)
                 {
 
                     Console.WriteLine("Requirements not valid. Installation will not start.");
@@ -1970,7 +1970,7 @@ namespace RZUpdate
                     RZisRunning = false;
                 }
             }
-            while (msiIsRunning | RZisRunning);
+            while (msiIsRunning || RZisRunning);
 
             bool bMutexCreated = false;
             bool bResult = false;
@@ -2019,17 +2019,15 @@ namespace RZUpdate
                         finally { UILock.ExitReadLock(); }
                         return true;
                     }
-                    else
-                    {
-                        downloadTask.Installed = false;
-                        downloadTask.Installing = false;
-                        downloadTask.Downloading = false;
-                    }
                 }
-                catch
+                catch(Exception ex)
                 {
-
+                    Console.WriteLine(ex.Message);
                 }
+
+                downloadTask.Installed = false;
+                downloadTask.Installing = false;
+                downloadTask.Downloading = false;
             }
             else
             {
@@ -2079,7 +2077,7 @@ namespace RZUpdate
         public bool _DownloadFile2(string URL, string FileName)
         {
             //Check if URL is HTTP, otherwise it must be a PowerShell
-            if (!URL.StartsWith("http", StringComparison.CurrentCultureIgnoreCase) &amp; !URL.StartsWith("ftp", StringComparison.CurrentCultureIgnoreCase))
+            if (!URL.StartsWith("http", StringComparison.CurrentCultureIgnoreCase) &amp;&amp; !URL.StartsWith("ftp", StringComparison.CurrentCultureIgnoreCase))
             {
                 Collection&lt;PSObject&gt; oResults = _RunPS(URL, FileName);
                 if (File.Exists(FileName))
diff --git a/RuckZuck_Tool/Properties/Settings.Designer.cs b/RuckZuck_Tool/Properties/Settings.Designer.cs
index 4779ec5..6dfd074 100644
--- a/RuckZuck_Tool/Properties/Settings.Designer.cs
+++ b/RuckZuck_Tool/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace RuckZuck_Tool.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -91,13 +91,25 @@ public string WebService {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string LocallRepository {
+        [global::System.Configuration.DefaultSettingValueAttribute("https://gateway.ipfs.io/ipfs")]
+        public string IPFSGW {
+            get {
+                return ((string)(this["IPFSGW"]));
+            }
+            set {
+                this["IPFSGW"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool DisableBroadcast {
             get {
-                return ((string)(this["LocallRepository"]));
+                return ((bool)(this["DisableBroadcast"]));
             }
             set {
-                this["LocallRepository"] = value;
+                this["DisableBroadcast"] = value;
             }
         }
     }
diff --git a/RuckZuck_Tool/Properties/Settings.settings b/RuckZuck_Tool/Properties/Settings.settings
index 0e52573..3989108 100644
--- a/RuckZuck_Tool/Properties/Settings.settings
+++ b/RuckZuck_Tool/Properties/Settings.settings
@@ -18,8 +18,11 @@
     <Setting Name="WebService" Type="System.String" Scope="Application">
       <Value Profile="(Default)">https://ruckzuck.azurewebsites.net/wcf/RZService.svc</Value>
     </Setting>
-    <Setting Name="LocallRepository" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+    <Setting Name="IPFSGW" Type="System.String" Scope="User">
+      <Value Profile="(Default)">https://gateway.ipfs.io/ipfs</Value>
+    </Setting>
+    <Setting Name="DisableBroadcast" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file