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.

Sign up for GitHub

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

Fix formatting #2160

Merged
merged 1 commit into from
Aug 24, 2019
Merged

Fix formatting #2160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 29 additions & 27 deletions WalletWasabi.Packager/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,8 +618,8 @@ private static void Publish()
string infoFilePath = Path.Combine(macContentsDir, "Info.plist");

Directory.CreateDirectory(resourcesDir);
var iconpath = Path.Combine(GuiProjectDirectory, "Assets", "WasabiLogo.icns");
File.Copy(iconpath, Path.Combine(resourcesDir, "WasabiLogo.icns"));
var iconPath = Path.Combine(GuiProjectDirectory, "Assets", "WasabiLogo.icns");
File.Copy(iconPath, Path.Combine(resourcesDir, "WasabiLogo.icns"));

string infoContent = $@"<?xml version=""1.0"" encoding=""UTF-8""?>
<!DOCTYPE plist PUBLIC ""-//Apple//DTD PLIST 1.0//EN"" ""http://www.apple.com/DTDs/PropertyList-1.0.dtd"">
Expand Down Expand Up @@ -751,7 +751,8 @@ private static void Publish()

var linuxPath = $"/mnt/c/{Tools.LinuxPath(BinDistDirectory.Replace("C:\\", ""))}"; // We assume that it is on drive C:\.

var commands = new[] {
var commands = new[]
{
"cd ~",
"sudo umount /mnt/c",
"sudo mount -t drvfs C: /mnt/c -o metadata",
Expand Down Expand Up @@ -811,47 +812,48 @@ private static void Publish()
var controlFilePath = Path.Combine(debianFolderPath, "control");
// License format does not yet work, but should work in the future, it's work in progress: https://bugs.launchpad.net/ubuntu/+source/software-center/+bug/435183
var controlFileContent = $"Package: {ExecutableName}\n" +
$"Priority: optional\n" +
$"Section: utils\n" +
$"Maintainer: nopara73 <adam.ficsor73@gmail.com>\n" +
$"Version: {VersionPrefix}\n" +
$"Homepage: http://wasabiwallet.io\n" +
$"Vcs-Git: git://github.com/zkSNACKs/WalletWasabi.git\n" +
$"Vcs-Browser: https://github.com/zkSNACKs/WalletWasabi\n" +
$"Architecture: amd64\n" +
$"License: Open Source (MIT)\n" +
$"Installed-Size: {installedSizeKb}\n" +
$"Description: open-source, non-custodial, privacy focused Bitcoin wallet\n" +
$" Built-in Tor, CoinJoin and Coin Control features.\n";
$"Priority: optional\n" +
$"Section: utils\n" +
$"Maintainer: nopara73 <adam.ficsor73@gmail.com>\n" +
$"Version: {VersionPrefix}\n" +
$"Homepage: http://wasabiwallet.io\n" +
$"Vcs-Git: git://github.com/zkSNACKs/WalletWasabi.git\n" +
$"Vcs-Browser: https://github.com/zkSNACKs/WalletWasabi\n" +
$"Architecture: amd64\n" +
$"License: Open Source (MIT)\n" +
$"Installed-Size: {installedSizeKb}\n" +
$"Description: open-source, non-custodial, privacy focused Bitcoin wallet\n" +
$" Built-in Tor, CoinJoin and Coin Control features.\n";

File.WriteAllText(controlFilePath, controlFileContent, Encoding.ASCII);

var desktopFilePath = Path.Combine(debUsrAppFolderPath, $"{ExecutableName}.desktop");
var desktopFileContent = $"[Desktop Entry]\n" +
$"Type=Application\n" +
$"Name=Wasabi Wallet\n" +
$"StartupWMClass=Wasabi Wallet\n" +
$"GenericName=Bitcoin Wallet\n" +
$"Comment=Privacy focused Bitcoin wallet.\n" +
$"Icon={ExecutableName}\n" +
$"Terminal=false\n" +
$"Exec={ExecutableName}\n" +
$"Categories=Office;Finance;\n" +
$"Keywords=bitcoin;wallet;crypto;blockchain;wasabi;privacy;anon;awesome;qwe;asd;\n";
$"Type=Application\n" +
$"Name=Wasabi Wallet\n" +
$"StartupWMClass=Wasabi Wallet\n" +
$"GenericName=Bitcoin Wallet\n" +
$"Comment=Privacy focused Bitcoin wallet.\n" +
$"Icon={ExecutableName}\n" +
$"Terminal=false\n" +
$"Exec={ExecutableName}\n" +
$"Categories=Office;Finance;\n" +
$"Keywords=bitcoin;wallet;crypto;blockchain;wasabi;privacy;anon;awesome;qwe;asd;\n";

File.WriteAllText(desktopFilePath, desktopFileContent, Encoding.ASCII);

var wasabiStarterScriptPath = Path.Combine(debUsrLocalBinFolderPath, $"{ExecutableName}");
var wasabiStarterScriptContent = $"#!/bin/sh\n" +
$"{ linuxWasabiWalletFolder.TrimEnd('/')}/{ExecutableName} $@\n";
$"{ linuxWasabiWalletFolder.TrimEnd('/')}/{ExecutableName} $@\n";

File.WriteAllText(wasabiStarterScriptPath, wasabiStarterScriptContent, Encoding.ASCII);

string debExeLinuxPath = Tools.LinuxPathCombine(newFolderRelativePath, ExecutableName);
string debDestopFileLinuxPath = Tools.LinuxPathCombine(debUsrAppFolderRelativePath, $"{ExecutableName}.desktop");
var wasabiStarterScriptLinuxPath = Tools.LinuxPathCombine(debUsrLocalBinFolderRelativePath, $"{ExecutableName}");

commands = new[] {
commands = new[]
{
"cd ~",
"sudo umount /mnt/c",
"sudo mount -t drvfs C: /mnt/c -o metadata",
Expand Down
2 changes: 1 addition & 1 deletion WalletWasabi/Services/WalletService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ private void Coins_CollectionChanged(object sender, NotifyCollectionChangedEvent
{
if (e.Action == NotifyCollectionChangedAction.Remove)
{
foreach(var toRemove in e.OldItems.Cast<SmartCoin>())
foreach (var toRemove in e.OldItems.Cast<SmartCoin>())
{
if (toRemove.SpenderTransactionId != null)
{
Expand Down