Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add grave accent when appropriate #1979

Merged
merged 2 commits into from Jul 28, 2019
Merged

Add grave accent when appropriate #1979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3b26bf
Add grave accent when appropriate
yahiheb Jul 22, 2019
51cd669
Merge branch 'master' into grave-accent
nopara73 Jul 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions WalletWasabi.Gui/Global.cs
View file
Open in desktop
Expand Up @@ -477,10 +477,10 @@ public KeyManager LoadKeyManager(string walletFullPath, string walletBackupFullP
if (File.Exists(corruptedWalletBackupPath))
{
File.Delete(corruptedWalletBackupPath);
Logger.LogInfo($"Deleted previous corrupted wallet file backup from {corruptedWalletBackupPath}.");
Logger.LogInfo($"Deleted previous corrupted wallet file backup from `{corruptedWalletBackupPath}`.");
}
File.Move(walletFullPath, corruptedWalletBackupPath);
Logger.LogInfo($"Backed up corrupted wallet file to {corruptedWalletBackupPath}.");
Logger.LogInfo($"Backed up corrupted wallet file to `{corruptedWalletBackupPath}`.");
}
File.Copy(walletBackupFullPath, walletFullPath);

Expand Down Expand Up @@ -560,7 +560,7 @@ public async Task DisposeInWalletDependentServicesAsync()
{
string backupWalletFilePath = Path.Combine(WalletBackupsDir, Path.GetFileName(WalletService.KeyManager.FilePath));
WalletService.KeyManager?.ToFile(backupWalletFilePath);
Logger.LogInfo($"{nameof(KeyManager)} backup saved to {backupWalletFilePath}.", nameof(Global));
Logger.LogInfo($"{nameof(KeyManager)} backup saved to `{backupWalletFilePath}`.", nameof(Global));
}
if (WalletService != null)
{
Expand Down
10 changes: 5 additions & 5 deletions WalletWasabi/Hwi/HwiProcessManager.cs
View file
Open in desktop
Expand Up @@ -166,7 +166,7 @@ public static async Task<JToken> SendCommandAsync(string command, CancellationTo
if (!File.Exists(HwiPath))
{
var exeName = Path.GetFileName(HwiPath);
throw new FileNotFoundException($"{exeName} not found at {HwiPath}. Maybe it was removed by an antivirus software!");
throw new FileNotFoundException($"{exeName} not found at `{HwiPath}`. Maybe it was removed by an antivirus software!");
}

using (var process = Process.Start(
Expand Down Expand Up @@ -232,7 +232,7 @@ public static async Task InitializeAsync(string dataDir, Network network, bool l

if (!File.Exists(hwiPath))
{
Logger.LogInfo($"HWI instance NOT found at {hwiPath}. Attempting to acquire it...", nameof(HwiProcessManager));
Logger.LogInfo($"HWI instance NOT found at `{hwiPath}`. Attempting to acquire it...", nameof(HwiProcessManager));
await InstallHwiAsync(fullBaseDirectory, hwiDir);
}
else if (!IoHelpers.CheckExpectedHash(hwiPath, Path.Combine(fullBaseDirectory, "Hwi", "Software")))
Expand All @@ -252,7 +252,7 @@ public static async Task InitializeAsync(string dataDir, Network network, bool l
{
if (logFound)
{
Logger.LogInfo($"HWI instance found at {hwiPath}.", nameof(HwiProcessManager));
Logger.LogInfo($"HWI instance found at `{hwiPath}`.", nameof(HwiProcessManager));
}
}

Expand All @@ -267,13 +267,13 @@ private static async Task InstallHwiAsync(string fullBaseDirectory, string hwiDi
{
string hwiLinuxZip = Path.Combine(hwiSoftwareDir, "hwi-linux64.zip");
await IoHelpers.BetterExtractZipToDirectoryAsync(hwiLinuxZip, hwiDir);
Logger.LogInfo($"Extracted {hwiLinuxZip} to {hwiDir}.", nameof(HwiProcessManager));
Logger.LogInfo($"Extracted {hwiLinuxZip} to `{hwiDir}`.", nameof(HwiProcessManager));
}
else // OSX
{
string hwiOsxZip = Path.Combine(hwiSoftwareDir, "hwi-osx64.zip");
await IoHelpers.BetterExtractZipToDirectoryAsync(hwiOsxZip, hwiDir);
Logger.LogInfo($"Extracted {hwiOsxZip} to {hwiDir}.", nameof(HwiProcessManager));
Logger.LogInfo($"Extracted {hwiOsxZip} to `{hwiDir}`.", nameof(HwiProcessManager));
}

// Make sure there's sufficient permission.
Expand Down