diff --git a/RuckZuck_Tool/Images/RuckZuck.png b/RuckZuck_Tool/Images/RuckZuck.png new file mode 100644 index 0000000..d61469d Binary files /dev/null and b/RuckZuck_Tool/Images/RuckZuck.png differ 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) & bDownload) + if (!string.IsNullOrEmpty(vFile.FileHash) && 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 & iExitCode != 3010) + if (iExitCode != 0 && 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() & !Force) + if (!CheckDTPreReq() && !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) & !URL.StartsWith("ftp", StringComparison.CurrentCultureIgnoreCase)) + if (!URL.StartsWith("http", StringComparison.CurrentCultureIgnoreCase) && !URL.StartsWith("ftp", StringComparison.CurrentCultureIgnoreCase)) { Collection<PSObject> 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 @@ https://ruckzuck.azurewebsites.net/wcf/RZService.svc - - + + https://gateway.ipfs.io/ipfs + + + False \ No newline at end of file