Skip to content

Commit

Permalink
Fix: cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@rzander
rzander committed Feb 14, 2018
1 parent 7116e63 commit c0159ac
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 21 deletions.
Binary file added RuckZuck_Tool/Images/RuckZuck.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 12 additions & 14 deletions RuckZuck_Tool/Properties/Resources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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); ;
Expand Down Expand Up @@ -1767,7 +1767,7 @@ namespace RZUpdate
RZisRunning = false;
}
}
while (msiIsRunning | RZisRunning);
while (msiIsRunning || RZisRunning);

bool bMutexCreated = false;
bool bResult = false;
Expand Down Expand Up @@ -1803,7 +1803,7 @@ namespace RZUpdate
{
bool bError = false;

if (!CheckDTPreReq() & !Force)
if (!CheckDTPreReq() && !Force)
{

Console.WriteLine("Requirements not valid. Installation will not start.");
Expand Down Expand Up @@ -1970,7 +1970,7 @@ namespace RZUpdate
RZisRunning = false;
}
}
while (msiIsRunning | RZisRunning);
while (msiIsRunning || RZisRunning);

bool bMutexCreated = false;
bool bResult = false;
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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))
Expand Down
22 changes: 17 additions & 5 deletions RuckZuck_Tool/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions RuckZuck_Tool/Properties/Settings.settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit c0159ac

Please sign in to comment.